@capgo/cli 0.8.6 → 0.11.0

package/src/bin/upload.ts

@@ -1,75 +1,29 @@
-import { loadConfig } from '@capacitor/cli/dist/config';
 import AdmZip from 'adm-zip';
-import axios from 'axios';
-import prettyjson from 'prettyjson';
 import { program } from 'commander';
+import { randomUUID } from 'crypto';
 import cliProgress from 'cli-progress';
-import axiosRetry from 'axios-retry';
-import { host, hostWeb, hostUpload, supaAnon } from './utils';
+import {
+  host, hostWeb, getConfig, createSupabaseClient,
+  updateOrCreateChannel, updateOrCreateVersion, formatError, findSavedKey
+} from './utils';
 
-axiosRetry(axios, { retries: 3, retryDelay: axiosRetry.exponentialDelay });
-const oneMb = 1048576; // size of one mb in bytes
-const maxMb = 30;
-const alertMb = 25;
-// enum string format
-enum UploadMode {
-  uft8 = 'utf8',
-  base64 = 'base64',
-  hex = 'hex',
-  binary = 'binary'
-}
-interface uploadPayload {
+interface Options {
   version: string
-  appid: string
-  fileName: string
-  channel: string
-  format: UploadMode
-  app: string,
-  isMultipart: boolean,
-  chunk: number,
-  totalChunks: number,
-}
-
-const formatDefault = UploadMode.binary;
-const chuckNumber = (l: number, divider: number) => l < divider ? 1 : Math.floor(l / divider)
-const chuckSize = (l: number, divider: number) => Math.floor(l / chuckNumber(l, divider))
-
-const mbConvert = {
-  'base64': (l: number) => Math.floor((l * 4) / 3),
-  'hex': (l: number) => Math.floor(l * 2),
-  'binary': (l: number) => l,
-  'utf8': (l: number) => l,
+  path: string
+  apikey: string
+  channel?: string
+  external?: string
 }
 
-const sendToBack = async (data: uploadPayload, apikey: string) => {
-  const res = await axios({
-    method: 'POST',
-    url: hostUpload,
-    data,
-    validateStatus: () => true,
-    headers: {
-      'Content-Type': 'application/json',
-      'apikey': apikey,
-      authorization: `Bearer ${supaAnon}`
-    }
-  })
-  return res
-}
+const maxMb = 30;
+const alertMb = 25;
 
-export const uploadVersion = async (appid, options) => {
+export const uploadVersion = async (appid: string, options: Options) => {
   let { version, path, channel } = options;
-  const { apikey, external, format } = options;
+  const { external } = options;
+  const apikey = options.apikey || findSavedKey()
   channel = channel || 'dev';
-  let config;
-  let formatType = formatDefault;
-  if (format in UploadMode) {
-    formatType = format as UploadMode;
-  }
-  try {
-    config = await loadConfig();
-  } catch (err) {
-    program.error("No capacitor config file found, run `cap init` first");
-  }
+  const config = await getConfig();
   appid = appid || config?.app?.appId
   version = version || config?.app?.package?.version
   path = path || config?.app?.webDir
@@ -80,94 +34,106 @@ export const uploadVersion = async (appid, options) => {
     program.error("Missing argument, you need to provide a appid and a version and a path, or be in a capacitor project");
   }
   console.log(`Upload ${appid}@${version} started from path "${path}" to Capgo cloud`);
-  if (external) {
-    try {
-      const res = await axios({
-        method: 'POST',
-        url: hostUpload,
-        data: {
-          version,
-          appid,
-          channel,
-          external,
-        },
-        validateStatus: () => true,
-        headers: {
-          'Content-Type': 'application/json',
-          'apikey': apikey,
-          authorization: `Bearer ${supaAnon}`
-        }
+
+  const supabase = createSupabaseClient(apikey)
+  const multibar = new cliProgress.MultiBar({
+    clearOnComplete: false,
+    hideCursor: true
+  }, cliProgress.Presets.shades_grey);
+
+  // add bars
+  const b1 = multibar.create(7, 0, {
+    format: 'Uploading: [{bar}] {percentage}% | ETA: {eta}s | {value}/{total} Part'
+  }, cliProgress.Presets.shades_grey);
+  b1.start(7, 0, {
+    speed: "N/A"
+  });
+  // checking if user has access rights before uploading
+  const { data: apiAccess, error: apiAccessError } = await supabase
+    .rpc('is_allowed_capgkey', { apikey, keymode: ['upload', 'write', 'all'], app_id: appid })
+
+  if (!apiAccess || apiAccessError) {
+    multibar.stop()
+    program.error(`Invalid API key or insufisant rights ${formatError(apiAccessError)}`);
+  }
+  b1.increment();
+
+  const { data, error: userIdError } = await supabase
+    .rpc<string>('get_user_id', { apikey })
+
+  const userId = data ? data.toString() : '';
+  if (!userId || userIdError) {
+    multibar.stop()
+    program.error(`Cannot verify user ${formatError(userIdError)}`);
+  }
+  b1.increment();
+
+  const { data: app, error: dbError0 } = await supabase
+    .rpc<string>('exist_app', { appid, apikey })
+  if (!app || dbError0) {
+    multibar.stop()
+    program.error(`Cannot find app ${appid} in your account \n${formatError(dbError0)}`)
+  }
+  b1.increment();
+
+  if (!external) {
+    const zip = new AdmZip();
+    zip.addLocalFolder(path);
+    const zipped = zip.toBuffer();
+    const mbSize = Math.floor(zipped.byteLength / 1024 / 1024);
+    const filePath = `apps/${userId}/${appid}/versions`
+    const fileName = randomUUID()
+    b1.increment();
+    if (mbSize > maxMb) {
+      multibar.stop()
+      program.error(`The app is too big, the limit is ${maxMb} Mb, your is ${mbSize} Mb`);
+    }
+    if (mbSize > alertMb) {
+      multibar.log(`WARNING !!\nThe app size is ${mbSize} Mb, the limit is ${maxMb} Mb\n`);
+    }
+
+    const { error: upError } = await supabase.storage
+      .from(filePath)
+      .upload(fileName, zipped, {
+        contentType: 'application/zip',
       })
-      if (res.status !== 200) {
-        program.error(`Server Error \n${prettyjson.render(res?.data || "")}`);
-      }
-    } catch (err) {
-      if (err.response) {
-        program.error(`Network Error \n${prettyjson.render(err.response?.data || "")}`)
-      } else {
-        program.error(`Network Error \n${prettyjson.render(err || "")}`)
-      }
+    if (upError) {
+      multibar.stop()
+      program.error(`Cannot upload ${formatError(upError)}`)
     }
-  } else {
-    const b1 = new cliProgress.SingleBar({
-      format: 'Uploading: [{bar}] {percentage}% | ETA: {eta}s | {value}/{total} Mb'
-    }, cliProgress.Presets.shades_grey);
-    try {
-      const zip = new AdmZip();
-      zip.addLocalFolder(path);
-      const zipped = zip.toBuffer();
-      const appData = zipped.toString(formatType);
-      // split appData in chunks and send them sequentially with axios
-      // console.log('appData size', appData.length)
-      const zippedSize = appData.length;
-      const mbSize = Math.floor(zippedSize / mbConvert[formatType](oneMb));
-      // console.log('mbSize', zippedSize, mbSize, mbConvert[formatType](oneMb))
-      const chunkSize = chuckNumber(zippedSize, mbConvert[formatType](oneMb)) > 1
-        ? chuckSize(zippedSize, mbConvert[formatType](oneMb)) : zippedSize;
-      if (mbSize > maxMb) {
-        program.error(`The app is too big, the limit is ${maxMb} Mb, your is ${mbSize} Mb`);
-      }
-      if (mbSize > alertMb) {
-        console.log(`WARNING !!\nThe app size is ${mbSize} Mb, the limit is ${maxMb} Mb`);
-      }
-      const chunks = [];
-      for (let i = 0; i < appData.length; i += chunkSize) {
-        chunks.push(appData.slice(i, i + chunkSize));
-      }
-      b1.start(chunks.length, 0, {
-        speed: "N/A"
-      });
-      let fileName
-      for (let i = 0; i < chunks.length; i += 1) {
-        const res = await sendToBack({
-          version,
-          appid,
-          fileName,
-          channel,
-          format: formatType,
-          app: chunks[i],
-          isMultipart: chunks.length > 1,
-          chunk: i + 1,
-          totalChunks: chunks.length,
-        }, apikey)
-        if (res.status !== 200) {
-          b1.stop();
-          program.error(`Server Error \n${prettyjson.render(res?.data || "")}`);
-        }
-        b1.update(i + 1)
-        fileName = res.data.fileName
-      }
-      b1.stop();
-    } catch (err) {
-      b1.stop();
-      if (err.response) {
-        program.error(`Network Error \n${prettyjson.render(err.response?.data || "")}`)
-      } else {
-        program.error(`Network Error \n${prettyjson.render(err || "")}`)
-      }
+  } else if (external && !external.startsWith('https://')) {
+    multibar.stop()
+    program.error(`External link should should start with "https://" current is "${external}"`)
+  }
+  b1.increment();
+  const fileName = randomUUID()
+  const { data: versionData, error: dbError } = await updateOrCreateVersion(supabase, {
+    bucket_id: external ? undefined : fileName,
+    user_id: userId,
+    name: version,
+    app_id: appid,
+    external_url: external,
+  }, apikey)
+  if (dbError) {
+    multibar.stop()
+    program.error(`Cannot add version ${formatError(dbError)}`)
+  }
+  b1.increment();
+  if (versionData && versionData.length) {
+    const { error: dbError3 } = await updateOrCreateChannel(supabase, {
+      name: channel,
+      app_id: appid,
+      created_by: userId,
+      version: versionData[0].id,
+    }, apikey)
+    if (dbError3) {
+      multibar.log('Cannot set version with upload key, use key with more rights for that\n');
     }
+  } else {
+    multibar.log('Cannot set version with upload key, use key with more rights for that\n');
   }
-
+  b1.increment();
+  multibar.stop()
   console.log("App uploaded to server")
   console.log(`Try it in mobile app: ${host}/app_mobile`)
   console.log(`Or set the channel ${channel} as public here: ${hostWeb}/app/package/${appid}`)

package/src/bin/utils.ts

@@ -1,12 +1,107 @@
-/* eslint-disable */
+import { loadConfig } from '@capacitor/cli/dist/config';
+import { program } from 'commander';
+import { createClient, SupabaseClient } from '@supabase/supabase-js'
+import prettyjson from 'prettyjson';
+import fs from 'fs'
+import os from 'os'
+import { definitions } from './types_supabase';
+
 export const host = 'https://capgo.app';
 export const hostWeb = 'https://web.capgo.app';
-export const hostUpload = 'https://xvwzpoazmxkqosrdewyv.functions.supabase.co/upload';
+// export const hostSupa = 'https://xvwzpoazmxkqosrdewyv.functions.supabase.co';
+export const hostSupa = 'https://aucsybvnhavogdmzwtcw.supabase.co';
+
 // For local test purposes
 // export const host = 'http://localhost:3334';
-// export const hostUpload = 'http://localhost:54321/functions/v1/upload';
-/* eslint-enable */
 
 /* eslint-disable */
-export const supaAnon = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiYW5vbiIsImlhdCI6MTYzNzgwNTAwOSwiZXhwIjoxOTUzMzgxMDA5fQ.8tgID1d4jodPwuo_fz4KHN4o1XKB9fnqyt0_GaJSj-w'
+// export const supaAnon = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiYW5vbiIsImlhdCI6MTYzNzgwNTAwOSwiZXhwIjoxOTUzMzgxMDA5fQ.8tgID1d4jodPwuo_fz4KHN4o1XKB9fnqyt0_GaJSj-w'
+export const supaAnon = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImF1Y3N5YnZuaGF2b2dkbXp3dGN3Iiwicm9sZSI6ImFub24iLCJpYXQiOjE2NTM1ODcxNjgsImV4cCI6MTk2OTE2MzE2OH0.8FKKJqiGgoVA3p9GH5wvnbWkWywIxVLqQyZFhupZ7C4'
 /* eslint-enable */
+
+export const createSupabaseClient = (apikey: string) => createClient(hostSupa, supaAnon, {
+    headers: {
+        capgkey: apikey,
+    }
+})
+
+export const findSavedKey = () => {
+    // search for key in home dir
+    const userHomeDir = os.homedir();
+    let keyPath = `${userHomeDir}/.capgo`;
+    if (fs.existsSync(keyPath)) {
+        const key = fs.readFileSync(keyPath, 'utf8');
+        return key.trim();
+    }
+    keyPath = `.capgo`;
+    if (fs.existsSync(keyPath)) {
+        const key = fs.readFileSync(keyPath, 'utf8');
+        return key.trim();
+    }
+    return null
+}
+
+export const formatError = (error: any) => error ? `\n${prettyjson.render(error)}` : ''
+
+interface Config {
+    app: {
+        appId: string;
+        appName: string;
+        webDir: string;
+        package: {
+            version: string;
+        };
+    };
+}
+export const getConfig = async () => {
+    let config: Config;
+    try {
+        config = await loadConfig();
+    } catch (err) {
+        program.error("No capacitor config file found, run `cap init` first");
+    }
+    return config;
+}
+
+export const updateOrCreateVersion = async (supabase: SupabaseClient, update: Partial<definitions['app_versions']>, apikey: string) => {
+    // console.log('updateOrCreateVersion', update, apikey)
+    const { data, error } = await supabase
+        .rpc<string>('exist_app_versions', { appid: update.app_id, name_version: update.name, apikey })
+    if (data && !error) {
+        update.deleted = false
+        return supabase
+            .from<definitions['app_versions']>('app_versions')
+            .update(update, { returning: "minimal" })
+            .eq('app_id', update.app_id)
+            .eq('name', update.name)
+    }
+    // console.log('create Version', data, error)
+
+    return supabase
+        .from<definitions['app_versions']>('app_versions')
+        .insert(update, { returning: "minimal" })
+
+}
+
+export const updateOrCreateChannel = async (supabase: SupabaseClient, update: Partial<definitions['channels']>, apikey: string) => {
+    // console.log('updateOrCreateChannel', update)
+    if (!update.app_id || !update.name || !update.created_by) {
+        console.error('missing app_id, name, or created_by')
+        return Promise.reject(new Error('missing app_id, name, or created_by'))
+    }
+    const { data, error } = await supabase
+        .rpc<string>('exist_channel', { appid: update.app_id, name_channel: update.name, apikey })
+    if (data && !error) {
+        return supabase
+            .from<definitions['channels']>('channels')
+            .update(update, { returning: "minimal" })
+            .eq('app_id', update.app_id)
+            .eq('name', update.name)
+            .eq('created_by', update.created_by)
+    }
+    // console.log('create Channel', data, error)
+
+    return supabase
+        .from<definitions['channels']>('channels')
+        .insert(update, { returning: "minimal" })
+}

package/test/test_headers_rls.ts

@@ -0,0 +1,26 @@
+import { createClient } from '@supabase/supabase-js'
+
+const supaUrl = 'https://aucsybvnhavogdmzwtcw.supabase.co'
+const apikey = '***'
+const anonKey = '***'
+const init = async () => {
+    const supabase = createClient(supaUrl, anonKey, {
+        headers: {
+            capgkey: '***',
+        }
+    })
+    const { data: userId } = await supabase
+        .rpc('get_user_id', { apikey })
+    console.log('userId', userId)
+    const apps = await supabase.from('apps')
+        .select()
+        .eq('app_id', 'ee.forgr.captime')
+    console.log('apps', apps.data)
+    // try to find one app
+}
+
+init()
+// (is_app_shared(uid(), app_id) OR is_allowed_apikey((((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text))::character varying, '{read}'::key_mode[]))
+// is_allowed_apikey(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{read}'::key_mode[])
+
+// (((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text) = 'dKC9teP4zHh7Lr5ak7hErgYn385C'::text)

package/tsconfig.json

@@ -1,7 +1,10 @@
 {
   "compilerOptions": {
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
     "module": "commonjs",
     "esModuleInterop": true,
+    "skipLibCheck": true,
     "resolveJsonModule": true,
     "target": "es6",
     "moduleResolution": "node",
@@ -11,5 +14,5 @@
     "lib": ["es2016", "dom"]
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules", "__tests__", "**/*.spec.ts"]
+  "exclude": ["node_modules", "dist", "__tests__", "**/*.spec.ts"]
 }