@capgo/cli 0.9.0 → 0.10.1

package/.cz.toml

@@ -1,7 +1,7 @@
 [tool.commitizen]
 name = "cz_conventional_commits"
 tag_format = "$major.$minor.$patch$prerelease"
-version = "0.9.0"
+version = "0.10.1"
 version_files = [
     "package.json:version",
     ".cz.toml"

package/.eslintignore

@@ -1,3 +1,4 @@
 dist
 test
 webpack.config.js
+src/bin/types_supabase.ts

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 0.10.1 (2022-06-01)
+
+### Fix
+
+- lint issue
+
+## 0.10.0 (2022-06-01)
+
+### Fix
+
+- remove useless import
+- types
+- error message system
+- remove old deps
+- add back limit in upload
+- right issue in cli
+- upload issue
+- upload
+- add method
+- replace all console.error by program exit
+- lint + do set
+
 ## 0.9.0 (2022-05-24)
 
 ### Fix

package/dist/index.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-(()=>{"use strict";var e={548:function(e,o,t){var r=this&&this.__awaiter||function(e,o,t,r){return new(t||(t=Promise))((function(n,a){function i(e){try{s(r.next(e))}catch(e){a(e)}}function p(e){try{s(r.throw(e))}catch(e){a(e)}}function s(e){var o;e.done?n(e.value):(o=e.value,o instanceof t?o:new t((function(e){e(o)}))).then(i,p)}s((r=r.apply(e,o||[])).next())}))},n=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(o,"__esModule",{value:!0}),o.addApp=void 0;const a=n(t(167)),i=n(t(867)),p=t(304),s=t(147),l=t(470),d=t(11),u=t(233),c="assets/icon.png";o.addApp=(e,o)=>r(void 0,void 0,void 0,(function*(){var t,r,n;let{name:f,icon:v}=o;const{apikey:g}=o,h=yield(0,u.getConfig)();let y;e=e||(null===(t=null==h?void 0:h.app)||void 0===t?void 0:t.appId),f=f||(null===(r=null==h?void 0:h.app)||void 0===r?void 0:r.appName)||"Unknown",v=v||"resources/icon.png",g||p.program.error("Missing API key, you need to provide a API key to add your app"),e&&f||p.program.error("Missing argument, you need to provide a appid and a name, or be in a capacitor project"),console.log(`Add ${e} to Capgo`),console.log("Adding...");const m={appid:e,name:f};if(v&&(0,l.existsSync)(v)){const e=(0,s.readFileSync)(v),o=(0,d.getType)(v);m.icon=e.toString("base64"),m.iconType=o||"image/png"}else if((0,l.existsSync)(c)){const e=(0,s.readFileSync)(c),o=(0,d.getType)(c);m.icon=e.toString("base64"),m.iconType=o||"image/png"}else console.warn(`Cannot find app icon in any of the following locations: ${v}, ${c}`);try{y=yield(0,a.default)({method:"POST",url:`${u.hostSupa}/add`,data:m,validateStatus:()=>!0,headers:{apikey:g,authorization:`Bearer ${u.supaAnon}`}})}catch(e){a.default.isAxiosError(e)&&e.response?p.program.error(`Network Error \n${i.default.render(null===(n=e.response)||void 0===n?void 0:n.data)}`):p.program.error(`Unknow error \n${i.default.render(e)}`)}y&&200===y.status||p.program.error(`Server Error \n${i.default.render(y.data)}`),console.log("App added to server, you can upload a version now")}))},453:function(e,o,t){var r=this&&this.__awaiter||function(e,o,t,r){return new(t||(t=Promise))((function(n,a){function i(e){try{s(r.next(e))}catch(e){a(e)}}function p(e){try{s(r.throw(e))}catch(e){a(e)}}function s(e){var o;e.done?n(e.value):(o=e.value,o instanceof t?o:new t((function(e){e(o)}))).then(i,p)}s((r=r.apply(e,o||[])).next())}))},n=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(o,"__esModule",{value:!0}),o.deleteApp=void 0;const a=n(t(167)),i=n(t(867)),p=t(304),s=t(233);o.deleteApp=(e,o)=>r(void 0,void 0,void 0,(function*(){var t,r;const{apikey:n,version:l}=o,d=yield(0,s.getConfig)();let u;e=e||(null===(t=null==d?void 0:d.app)||void 0===t?void 0:t.appId),n||p.program.error("Missing API key, you need to provide an API key to delete your app"),e||p.program.error("Missing argument, you need to provide a appid, or be in a capacitor project"),console.log(`Delete ${e} to Capgo`);try{console.log("Deleting..."),u=yield(0,a.default)({method:"POST",url:`${s.hostSupa}/delete`,data:{appid:e,version:l},validateStatus:()=>!0,headers:{apikey:n,authorization:`Bearer ${s.supaAnon}`}})}catch(e){a.default.isAxiosError(e)&&e.response?p.program.error(`Network Error \n${i.default.render(null===(r=e.response)||void 0===r?void 0:r.data)}`):p.program.error(`Unknow error \n${i.default.render(e)}`)}u&&200===u.status||p.program.error(`Server Error \n${i.default.render(u.data)}`),console.log("App deleted to server")}))},473:function(e,o,t){var r=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(o,"__esModule",{value:!0});const n=t(304),a=t(548),i=t(453),p=t(666),s=t(310),l=r(t(598));n.program.version(l.default.version).command("add [appid]").alias("a").action(a.addApp).option("-n, --name <name>","app name").option("-i, --icon <icon>","app icon path").option("-a, --apikey <apikey>","apikey to link to your account"),n.program.command("upload [appid]").alias("u").action(s.uploadVersion).option("-a, --apikey <apikey>","apikey to link to your account").option("-p, --path <path>","path of the file to upload").option("-c, --channel <channel>","channel to link to").option("-e, --external <url>","link to external url intead of upload to capgo cloud").option("-f, --format <base64|hex|binary|utf8>","choose the upload format default base64").option("-v, --version <version>","version number of the file to upload"),n.program.command("set [appid]").alias("s").action(p.setChannel).option("-c, --channel <channel>","channel to link to").option("-v, --version <version>","version number of the file to upload").option("-s, --state <state>","set the state of the channel, public or private").option("-a, --apikey <apikey>","apikey to link to your account"),n.program.description("Manage package and version in capgo Cloud").command("delete [appid]").alias("a").action(i.deleteApp).option("-a, --apikey <apikey>","apikey to link to your account").option("-v, --version <version>","version number of the app to delete"),n.program.parse(process.argv)},666:function(e,o,t){var r=this&&this.__awaiter||function(e,o,t,r){return new(t||(t=Promise))((function(n,a){function i(e){try{s(r.next(e))}catch(e){a(e)}}function p(e){try{s(r.throw(e))}catch(e){a(e)}}function s(e){var o;e.done?n(e.value):(o=e.value,o instanceof t?o:new t((function(e){e(o)}))).then(i,p)}s((r=r.apply(e,o||[])).next())}))},n=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(o,"__esModule",{value:!0}),o.setChannel=void 0;const a=n(t(167)),i=n(t(867)),p=t(304),s=t(233);o.setChannel=(e,o)=>r(void 0,void 0,void 0,(function*(){var t,r,n,l;let{version:d}=o;const{apikey:u,state:c,channel:f="dev"}=o,v=yield(0,s.getConfig)();let g,h;e=e||(null===(t=null==v?void 0:v.app)||void 0===t?void 0:t.appId),d=d||(null===(n=null===(r=null==v?void 0:v.app)||void 0===r?void 0:r.package)||void 0===n?void 0:n.version),"public"!==c&&"private"!==c||(h="public"===c),u||p.program.error("Missing API key, you need to provide a API key to add your app"),e||p.program.error("Missing argument, you need to provide a appid, or be in a capacitor project"),d||h||p.program.error("Missing argument, you need to provide a state or a version"),d?console.log(`Set ${f} to @${d} in ${e}`):console.log(`Set${f} to @${c} in ${e}`);try{g=yield(0,a.default)({method:"POST",url:`${s.hostSupa}/channel`,data:{version:d,public:h,appid:e,channel:f},validateStatus:()=>!0,headers:{apikey:u,authorization:`Bearer ${s.supaAnon}`}})}catch(e){a.default.isAxiosError(e)&&e.response?p.program.error(`Network Error \n${i.default.render(null===(l=e.response)||void 0===l?void 0:l.data)}`):p.program.error(`Unknow error \n${i.default.render(e)}`)}g&&200===g.status||p.program.error(`Server Error \n${i.default.render(g.data)}`),d?console.log("Done ✅"):console.log(`You can use now is channel in your app with the url: ${s.host}/api/latest?appid=${e}&channel=${f}`)}))},310:function(e,o,t){var r=this&&this.__awaiter||function(e,o,t,r){return new(t||(t=Promise))((function(n,a){function i(e){try{s(r.next(e))}catch(e){a(e)}}function p(e){try{s(r.throw(e))}catch(e){a(e)}}function s(e){var o;e.done?n(e.value):(o=e.value,o instanceof t?o:new t((function(e){e(o)}))).then(i,p)}s((r=r.apply(e,o||[])).next())}))},n=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(o,"__esModule",{value:!0}),o.uploadVersion=void 0;const a=n(t(844)),i=n(t(167)),p=n(t(867)),s=t(304),l=n(t(295)),d=n(t(188)),u=t(233);(0,d.default)(i.default,{retries:5,retryDelay:d.default.exponentialDelay});const c=1048576;var f;!function(e){e.uft8="utf8",e.base64="base64",e.hex="hex",e.binary="binary"}(f||(f={}));const v=f.binary,g=(e,o)=>e<o?1:Math.floor(e/o),h={base64:e=>Math.floor(4*e/3),hex:e=>Math.floor(2*e),binary:e=>e,utf8:e=>e},y=(e,o)=>r(void 0,void 0,void 0,(function*(){return(0,i.default)({method:"POST",url:`${u.hostSupa}/upload`,data:e,validateStatus:()=>!0,headers:{"Content-Type":"application/json",apikey:o,authorization:`Bearer ${u.supaAnon}`}})}));o.uploadVersion=(e,o)=>r(void 0,void 0,void 0,(function*(){var t,r,n,d,m,k;let{version:b,path:x,channel:w}=o;const{apikey:_,external:$,format:A}=o;w=w||"dev";const M=yield(0,u.getConfig)();let S=v;if(A&&A in f&&(S=A),e=e||(null===(t=null==M?void 0:M.app)||void 0===t?void 0:t.appId),b=b||(null===(n=null===(r=null==M?void 0:M.app)||void 0===r?void 0:r.package)||void 0===n?void 0:n.version),x=x||(null===(d=null==M?void 0:M.app)||void 0===d?void 0:d.webDir),_||s.program.error("Missing API key, you need to provide a API key to add your app"),e&&b&&x||s.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 ${e}@${b} started from path "${x}" to Capgo cloud`),$)try{const o=yield y({version:b,appid:e,channel:w,external:$},_);200!==o.status&&s.program.error(`Server Error \n${p.default.render((null==o?void 0:o.data)||"")}`)}catch(e){i.default.isAxiosError(e)&&e.response?s.program.error(`Network Error \n${p.default.render(null===(m=e.response)||void 0===m?void 0:m.data)}`):s.program.error(`Unknow error \n${p.default.render(e)}`)}else{const o=new l.default.SingleBar({format:"Uploading: [{bar}] {percentage}% | ETA: {eta}s | {value}/{total} Mb"},l.default.Presets.shades_grey);try{const t=new a.default;t.addLocalFolder(x);const r=t.toBuffer().toString(S),n=r.length,i=Math.floor(n/h[S](c)),l=g(n,h[S](c))>1?(I=n,P=h[S](c),Math.floor(I/g(I,P))):n;i>30&&s.program.error(`The app is too big, the limit is 30 Mb, your is ${i} Mb`),i>25&&console.log(`WARNING !!\nThe app size is ${i} Mb, the limit is 30 Mb`);const d=[];for(let e=0;e<r.length;e+=l)d.push(r.slice(e,e+l));let u;o.start(d.length,0,{speed:"N/A"});for(let t=0;t<d.length;t+=1){const r=yield y({version:b,appid:e,fileName:u,channel:w,format:S,app:d[t],isMultipart:d.length>1,chunk:t+1,totalChunks:d.length},_);200===r.status&&r.data.fileName||(o.stop(),s.program.error(`Server Error \n${p.default.render((null==r?void 0:r.data)||"")}`)),o.update(t+1),u=r.data.fileName}o.stop()}catch(e){o.stop(),i.default.isAxiosError(e)&&e.response?s.program.error(`Network Error \n${p.default.render(null===(k=e.response)||void 0===k?void 0:k.data)}`):s.program.error(`Unknow error \n${p.default.render(e)}`)}}var I,P;console.log("App uploaded to server"),console.log(`Try it in mobile app: ${u.host}/app_mobile`),console.log(`Or set the channel ${w} as public here: ${u.hostWeb}/app/package/${e}`),console.log("To use with live update in your own app")}))},233:function(e,o,t){var r=this&&this.__awaiter||function(e,o,t,r){return new(t||(t=Promise))((function(n,a){function i(e){try{s(r.next(e))}catch(e){a(e)}}function p(e){try{s(r.throw(e))}catch(e){a(e)}}function s(e){var o;e.done?n(e.value):(o=e.value,o instanceof t?o:new t((function(e){e(o)}))).then(i,p)}s((r=r.apply(e,o||[])).next())}))};Object.defineProperty(o,"__esModule",{value:!0}),o.getConfig=o.supaAnon=o.hostSupa=o.hostWeb=o.host=void 0;const n=t(778),a=t(304);o.host="https://capgo.app",o.hostWeb="https://web.capgo.app",o.hostSupa="https://xvwzpoazmxkqosrdewyv.functions.supabase.co",o.supaAnon="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiYW5vbiIsImlhdCI6MTYzNzgwNTAwOSwiZXhwIjoxOTUzMzgxMDA5fQ.8tgID1d4jodPwuo_fz4KHN4o1XKB9fnqyt0_GaJSj-w",o.getConfig=()=>r(void 0,void 0,void 0,(function*(){let e;try{e=yield(0,n.loadConfig)()}catch(e){a.program.error("No capacitor config file found, run `cap init` first")}return e}))},778:e=>{e.exports=require("@capacitor/cli/dist/config")},844:e=>{e.exports=require("adm-zip")},167:e=>{e.exports=require("axios")},188:e=>{e.exports=require("axios-retry")},295:e=>{e.exports=require("cli-progress")},304:e=>{e.exports=require("commander")},470:e=>{e.exports=require("fs-extra")},11:e=>{e.exports=require("mime")},867:e=>{e.exports=require("prettyjson")},147:e=>{e.exports=require("fs")},598:e=>{e.exports=JSON.parse('{"name":"@capgo/cli","version":"0.9.0","description":"A CLI to upload to capgo servers","main":"dist/index.js","bin":{"capgo":"dist/index.js"},"repository":{"type":"git","url":"git+https://github.com/Cap-go/capgo-cli.git"},"bugs":{"url":"https://github.com/Cap-go/capgo-cli/issues"},"keywords":["appflow alternative","ionic","capacitor","auto update","live update","capgo","cli","upload","capgo-cli"],"scripts":{"dev":"set NODE_ENV=development&& npx webpack --config webpack.config.js","no-debug":"node dist/index.js","build":"set NODE_ENV=production&& npx webpack --config webpack.config.js","pack":"pkg","lint":"eslint . --ext .ts --fix"},"author":"github.com/riderx","license":"Apache 2.0","dependencies":{"@capacitor/cli":"3.5.1","adm-zip":"^0.5.9","axios":"0.27.2","axios-retry":"^3.2.5","cli-progress":"3.11.0","commander":"9.2.0","form-data":"^4.0.0","fs-extra":"10.1.0","mime":"^3.0.0","node-stream-zip":"^1.15.0","prettyjson":"^1.2.5","upath":"^2.0.1"},"devDependencies":{"@types/adm-zip":"0.5.0","@types/cli-progress":"^3.11.0","@types/fs-extra":"^9.0.13","@types/mime":"^2.0.3","@types/node":"^17.0.31","@types/prettyjson":"^0.0.30","@typescript-eslint/eslint-plugin":"5.22.0","@typescript-eslint/parser":"5.22.0","eslint":"8.14.0","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^8.5.0","eslint-import-resolver-typescript":"2.7.1","eslint-plugin-import":"2.26.0","eslint-plugin-prettier":"^4.0.0","git-format-staged":"3.0.0","husky":"^7.0.4","nodemon":"2.0.16","pkg":"5.6.0","prettier":"2.6.2","ts-loader":"^9.3.0","ts-node":"^10.7.0","tsconfig-paths":"4.0.0","typescript":"4.6.4","webpack":"5.72.0","webpack-cli":"^4.9.2","webpack-node-externals":"^3.0.0"}}')}},o={};!function t(r){var n=o[r];if(void 0!==n)return n.exports;var a=o[r]={exports:{}};return e[r].call(a.exports,a,a.exports,t),a.exports}(473)})();
+(()=>{"use strict";var e={548:function(e,o,r){var t=this&&this.__awaiter||function(e,o,r,t){return new(r||(r=Promise))((function(a,n){function i(e){try{s(t.next(e))}catch(e){n(e)}}function p(e){try{s(t.throw(e))}catch(e){n(e)}}function s(e){var o;e.done?a(e.value):(o=e.value,o instanceof r?o:new r((function(e){e(o)}))).then(i,p)}s((t=t.apply(e,o||[])).next())}))};Object.defineProperty(o,"__esModule",{value:!0}),o.addApp=void 0;const a=r(304),n=r(113),i=r(147),p=r(470),s=r(11),d=r(233),l="assets/icon.png";o.addApp=(e,o)=>t(void 0,void 0,void 0,(function*(){var r,t;let{name:c,icon:u}=o;const{apikey:m}=o,g=yield(0,d.getConfig)();e=e||(null===(r=null==g?void 0:g.app)||void 0===r?void 0:r.appId),c=c||(null===(t=null==g?void 0:g.app)||void 0===t?void 0:t.appName)||"Unknown",u=u||"resources/icon.png",m||a.program.error("Missing API key, you need to provide a API key to add your app"),e&&c||a.program.error("Missing argument, you need to provide a appid and a name, or be in a capacitor project"),console.log(`Add ${e} to Capgo`);const v=(0,d.createSupabaseClient)(m),{data:f,error:y}=yield v.rpc("is_allowed_capgkey",{apikey:m,keymode:["write","all"]});if(!f||y)return void console.log("Invalid API key or insufisant rights");let h,_;console.log("Adding..."),u&&(0,p.existsSync)(u)?(h=(0,i.readFileSync)(u),_=(0,s.getType)(u)||"image/png",console.warn(`Found app icon ${u}`)):(0,p.existsSync)(l)?(h=(0,i.readFileSync)(l),_=(0,s.getType)(l)||"image/png",console.warn(`Found app icon ${l}`)):console.warn(`Cannot find app icon in any of the following locations: ${u}, ${l}`);const{data:k,error:b}=yield v.rpc("get_user_id",{apikey:m}),$=k?k.toString():"";$&&!b||a.program.error(`Cannot verify user ${(0,d.formatError)(b)}`);const{data:w,error:C}=yield v.rpc("exist_app",{appid:e,apikey:m});(w||C)&&a.program.error(`App already exists ${(0,d.formatError)(C)}`);const x=`icon_${(0,n.randomUUID)()}`;let I="https://xvwzpoazmxkqosrdewyv.supabase.co/storage/v1/object/public/images/capgo.png";if(h&&_){const{error:o}=yield v.storage.from(`images/${$}/${e}`).upload(x,h,{contentType:_});o&&a.program.error(`Could not add app ${(0,d.formatError)(o)}`);const{data:r}=yield v.storage.from(`images/${$}/${e}`).getPublicUrl(x);I=(null==r?void 0:r.publicURL)||I}const{error:q}=yield v.from("apps").insert({icon_url:I,user_id:$,name:c,app_id:e},{returning:"minimal"});q&&a.program.error(`Could not add app ${(0,d.formatError)(q)}`),console.log("App added to server, you can upload a version now")}))},453:function(e,o,r){var t=this&&this.__awaiter||function(e,o,r,t){return new(r||(r=Promise))((function(a,n){function i(e){try{s(t.next(e))}catch(e){n(e)}}function p(e){try{s(t.throw(e))}catch(e){n(e)}}function s(e){var o;e.done?a(e.value):(o=e.value,o instanceof r?o:new r((function(e){e(o)}))).then(i,p)}s((t=t.apply(e,o||[])).next())}))};Object.defineProperty(o,"__esModule",{value:!0}),o.deleteApp=void 0;const a=r(304),n=r(233);o.deleteApp=(e,o)=>t(void 0,void 0,void 0,(function*(){var r;const{apikey:t,version:i}=o,p=yield(0,n.getConfig)();e=e||(null===(r=null==p?void 0:p.app)||void 0===r?void 0:r.appId),t||a.program.error("Missing API key, you need to provide an API key to delete your app"),e||a.program.error("Missing argument, you need to provide a appid, or be in a capacitor project"),console.log(`Delete ${e} to Capgo`);const s=(0,n.createSupabaseClient)(t),{data:d,error:l}=yield s.rpc("is_allowed_capgkey",{apikey:t,keymode:["write","all"],app_id:e});if(!d||l)return void console.log("Invalid API key or insufisant rights");const{data:c,error:u}=yield s.rpc("get_user_id",{apikey:t}),m=c?c.toString():"";m&&!u||a.program.error(`Cannot verify user ${(0,n.formatError)(u)}`);const{data:g,error:v}=yield s.rpc("exist_app",{appid:e,apikey:t});if(g&&!v||a.program.error("No permission to delete"),i){const{data:o,error:r}=yield s.from("app_versions").select().eq("app_id",e).eq("user_id",m).eq("name",i).eq("deleted",!1);o&&o.length&&!r||a.program.error(`Version ${e}@${i} don't exist ${(0,n.formatError)(r)}`);const{data:t,error:p}=yield s.from("channels").select().eq("app_id",e).eq("created_by",m).eq("version",o[0].id);(t&&t.length||p)&&a.program.error(`Version ${e}@${i} is used in a channel, unlink it first ${(0,n.formatError)(p)}`);const{data:d,error:l}=yield s.from("devices_override").select().eq("app_id",e).eq("version",o[0].id);(d&&d.length||l)&&a.program.error(`Version ${e} @${i} is used in a device override, unlink it first ${(0,n.formatError)(l)}`);const{error:c}=yield s.storage.from("apps").remove([`${m} /${e}/versions / ${o[0].bucket_id} `]);c&&a.program.error(`Something went wrong when trying to delete ${e} @${i} ${c} `);const{error:u}=yield s.from("app_versions").update({deleted:!0}).eq("app_id",e).eq("name",i).eq("user_id",m);return u&&a.program.error(`App ${e} @${i} not found in database ${u} `),void console.log("App version deleted from server")}const{data:f,error:y}=yield s.from("app_versions").select().eq("app_id",e).eq("user_id",m);if(y&&a.program.error(`App ${e} not found in database ${y} `),f&&f.length){const o=f.map((o=>`${m} /${e}/versions / ${o.bucket_id} `)),{error:r}=yield s.storage.from("apps").remove(o);r&&a.program.error(`Cannot delete stored version for app ${e} from storage ${r} `)}const{error:h}=yield s.from("app_versions").delete().eq("app_id",e).eq("user_id",m);h&&a.program.error(`Cannot delete version for app ${e} from database ${h} `);const{error:_}=yield s.from("apps").delete().eq("app_id",e).eq("user_id",m);_&&a.program.error(`Cannot delete from database ${_} `),console.log("App deleted from server")}))},473:function(e,o,r){var t=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(o,"__esModule",{value:!0});const a=r(304),n=r(548),i=r(453),p=r(666),s=r(310),d=t(r(598));a.program.version(d.default.version).command("add [appid]").alias("a").action(n.addApp).option("-n, --name <name>","app name").option("-i, --icon <icon>","app icon path").option("-a, --apikey <apikey>","apikey to link to your account"),a.program.command("upload [appid]").alias("u").action(s.uploadVersion).option("-a, --apikey <apikey>","apikey to link to your account").option("-p, --path <path>","path of the file to upload").option("-c, --channel <channel>","channel to link to").option("-e, --external <url>","link to external url intead of upload to capgo cloud").option("-f, --format <base64|hex|binary|utf8>","choose the upload format default base64").option("-v, --version <version>","version number of the file to upload"),a.program.command("set [appid]").alias("s").action(p.setChannel).option("-c, --channel <channel>","channel to link to").option("-v, --version <version>","version number of the file to upload").option("-s, --state <state>","set the state of the channel, public or private").option("-a, --apikey <apikey>","apikey to link to your account"),a.program.description("Manage package and version in capgo Cloud").command("delete [appid]").alias("a").action(i.deleteApp).option("-a, --apikey <apikey>","apikey to link to your account").option("-v, --version <version>","version number of the app to delete"),a.program.parse(process.argv)},666:function(e,o,r){var t=this&&this.__awaiter||function(e,o,r,t){return new(r||(r=Promise))((function(a,n){function i(e){try{s(t.next(e))}catch(e){n(e)}}function p(e){try{s(t.throw(e))}catch(e){n(e)}}function s(e){var o;e.done?a(e.value):(o=e.value,o instanceof r?o:new r((function(e){e(o)}))).then(i,p)}s((t=t.apply(e,o||[])).next())}))};Object.defineProperty(o,"__esModule",{value:!0}),o.setChannel=void 0;const a=r(304),n=r(233);o.setChannel=(e,o)=>t(void 0,void 0,void 0,(function*(){var r,t,i;let{version:p}=o;const{apikey:s,state:d,channel:l="dev"}=o,c=yield(0,n.getConfig)();let u;e=e||(null===(r=null==c?void 0:c.app)||void 0===r?void 0:r.appId),p=p||(null===(i=null===(t=null==c?void 0:c.app)||void 0===t?void 0:t.package)||void 0===i?void 0:i.version),"public"!==d&&"private"!==d||(u="public"===d),s||a.program.error("Missing API key, you need to provide a API key to add your app"),e||a.program.error("Missing argument, you need to provide a appid, or be in a capacitor project"),p||u||a.program.error("Missing argument, you need to provide a state or a version"),p?console.log(`Set ${l} to @${p} in ${e}`):console.log(`Set${l} to @${d} in ${e}`);try{const o=(0,n.createSupabaseClient)(s),{data:r,error:t}=yield o.rpc("is_allowed_capgkey",{apikey:s,keymode:["write","all"],app_id:e});r&&!t||a.program.error("Invalid API key or insufisant rights");const{data:i,error:d}=yield o.rpc("get_user_id",{apikey:s}),c=i?i.toString():"";c&&!d||a.program.error("Cannot verify user");const m={created_by:c,app_id:e,name:l};if(p){const{data:r,error:t}=yield o.from("app_versions").select().eq("app_id",e).eq("name",p).eq("user_id",c).eq("deleted",!1);!t&&r&&r.length||a.program.error(`Cannot find version ${p}`),m.version=r[0].id}void 0!==u&&(m.public=u);try{const{error:e}=yield(0,n.updateOrCreateChannel)(o,m,s);e&&a.program.error(`Cannot set channel ${(0,n.formatError)(e)}`)}catch(e){a.program.error(`Cannot set channel ${(0,n.formatError)(e)}`)}}catch(e){a.program.error(`Unknow error ${(0,n.formatError)(e)}`)}p?console.log("Done ✅"):console.log(`You can use now is channel in your app with the url: ${n.host}/api/latest?appid=${e}&channel=${l}`)}))},310:function(e,o,r){var t=this&&this.__awaiter||function(e,o,r,t){return new(r||(r=Promise))((function(a,n){function i(e){try{s(t.next(e))}catch(e){n(e)}}function p(e){try{s(t.throw(e))}catch(e){n(e)}}function s(e){var o;e.done?a(e.value):(o=e.value,o instanceof r?o:new r((function(e){e(o)}))).then(i,p)}s((t=t.apply(e,o||[])).next())}))},a=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(o,"__esModule",{value:!0}),o.uploadVersion=void 0;const n=a(r(844)),i=r(304),p=r(113),s=a(r(295)),d=r(233);o.uploadVersion=(e,o)=>t(void 0,void 0,void 0,(function*(){var r,t,a,l;let{version:c,path:u,channel:m}=o;const{apikey:g,external:v}=o;m=m||"dev";const f=yield(0,d.getConfig)();e=e||(null===(r=null==f?void 0:f.app)||void 0===r?void 0:r.appId),c=c||(null===(a=null===(t=null==f?void 0:f.app)||void 0===t?void 0:t.package)||void 0===a?void 0:a.version),u=u||(null===(l=null==f?void 0:f.app)||void 0===l?void 0:l.webDir),g||i.program.error("Missing API key, you need to provide a API key to add your app"),e&&c&&u||i.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 ${e}@${c} started from path "${u}" to Capgo cloud`);const y=(0,d.createSupabaseClient)(g),h=new s.default.MultiBar({clearOnComplete:!1,hideCursor:!0},s.default.Presets.shades_grey),_=h.create(7,0,{format:"Uploading: [{bar}] {percentage}% | ETA: {eta}s | {value}/{total} Part"},s.default.Presets.shades_grey);_.start(7,0,{speed:"N/A"});const{data:k,error:b}=yield y.rpc("is_allowed_capgkey",{apikey:g,keymode:["upload","write","all"],app_id:e});k&&!b||(h.stop(),i.program.error(`Invalid API key or insufisant rights ${(0,d.formatError)(b)}`)),_.increment();const{data:$,error:w}=yield y.rpc("get_user_id",{apikey:g}),C=$?$.toString():"";C&&!w||(h.stop(),i.program.error(`Cannot verify user ${(0,d.formatError)(w)}`)),_.increment();const{data:x,error:I}=yield y.rpc("exist_app",{appid:e,apikey:g});if(x&&!I||(h.stop(),i.program.error(`Cannot find app ${e} in your account \n${(0,d.formatError)(I)}`)),_.increment(),v)v&&!v.startsWith("https://")&&(h.stop(),i.program.error(`External link should should start with "https://" current is "${v}"`));else{const o=new n.default;o.addLocalFolder(u);const r=o.toBuffer(),t=Math.floor(r.byteLength/1024/1024),a=`apps/${C}/${e}/versions`,s=(0,p.randomUUID)();_.increment(),t>30&&(h.stop(),i.program.error(`The app is too big, the limit is 30 Mb, your is ${t} Mb`)),t>25&&h.log(`WARNING !!\nThe app size is ${t} Mb, the limit is 30 Mb\n`);const{error:l}=yield y.storage.from(a).upload(s,r,{contentType:"application/zip"});l&&(h.stop(),i.program.error(`Cannot upload ${(0,d.formatError)(l)}`))}_.increment();const q=(0,p.randomUUID)(),{data:A,error:M}=yield(0,d.updateOrCreateVersion)(y,{bucket_id:v?void 0:q,user_id:C,name:c,app_id:e,external_url:v},g);if(M&&(h.stop(),i.program.error(`Cannot add version ${(0,d.formatError)(M)}`)),_.increment(),A&&A.length){const{error:o}=yield(0,d.updateOrCreateChannel)(y,{name:m,app_id:e,created_by:C,version:A[0].id},g);o&&h.log("Cannot set version with upload key, use key with more rights for that\n")}else h.log("Cannot set version with upload key, use key with more rights for that\n");_.increment(),h.stop(),console.log("App uploaded to server"),console.log(`Try it in mobile app: ${d.host}/app_mobile`),console.log(`Or set the channel ${m} as public here: ${d.hostWeb}/app/package/${e}`),console.log("To use with live update in your own app")}))},233:function(e,o,r){var t=this&&this.__awaiter||function(e,o,r,t){return new(r||(r=Promise))((function(a,n){function i(e){try{s(t.next(e))}catch(e){n(e)}}function p(e){try{s(t.throw(e))}catch(e){n(e)}}function s(e){var o;e.done?a(e.value):(o=e.value,o instanceof r?o:new r((function(e){e(o)}))).then(i,p)}s((t=t.apply(e,o||[])).next())}))},a=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(o,"__esModule",{value:!0}),o.updateOrCreateChannel=o.updateOrCreateVersion=o.getConfig=o.formatError=o.createSupabaseClient=o.supaAnon=o.hostSupa=o.hostWeb=o.host=void 0;const n=r(778),i=r(304),p=r(885),s=a(r(867));o.host="https://capgo.app",o.hostWeb="https://web.capgo.app",o.hostSupa="https://aucsybvnhavogdmzwtcw.supabase.co",o.supaAnon="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImF1Y3N5YnZuaGF2b2dkbXp3dGN3Iiwicm9sZSI6ImFub24iLCJpYXQiOjE2NTM1ODcxNjgsImV4cCI6MTk2OTE2MzE2OH0.8FKKJqiGgoVA3p9GH5wvnbWkWywIxVLqQyZFhupZ7C4",o.createSupabaseClient=e=>(0,p.createClient)(o.hostSupa,o.supaAnon,{headers:{capgkey:e}}),o.formatError=e=>e?`\n${s.default.render(e)}`:"",o.getConfig=()=>t(void 0,void 0,void 0,(function*(){let e;try{e=yield(0,n.loadConfig)()}catch(e){i.program.error("No capacitor config file found, run `cap init` first")}return e})),o.updateOrCreateVersion=(e,o,r)=>t(void 0,void 0,void 0,(function*(){const{data:t,error:a}=yield e.rpc("exist_app_versions",{appid:o.app_id,name_version:o.name,apikey:r});return t&&!a?(o.deleted=!1,e.from("app_versions").update(o,{returning:"minimal"}).eq("app_id",o.app_id).eq("name",o.name)):e.from("app_versions").insert(o,{returning:"minimal"})})),o.updateOrCreateChannel=(e,o,r)=>t(void 0,void 0,void 0,(function*(){if(!o.app_id||!o.name||!o.created_by)return console.error("missing app_id, name, or created_by"),Promise.reject(new Error("missing app_id, name, or created_by"));const{data:t,error:a}=yield e.rpc("exist_channel",{appid:o.app_id,name_channel:o.name,apikey:r});return t&&!a?e.from("channels").update(o,{returning:"minimal"}).eq("app_id",o.app_id).eq("name",o.name).eq("created_by",o.created_by):e.from("channels").insert(o,{returning:"minimal"})}))},778:e=>{e.exports=require("@capacitor/cli/dist/config")},885:e=>{e.exports=require("@supabase/supabase-js")},844:e=>{e.exports=require("adm-zip")},295:e=>{e.exports=require("cli-progress")},304:e=>{e.exports=require("commander")},470:e=>{e.exports=require("fs-extra")},11:e=>{e.exports=require("mime")},867:e=>{e.exports=require("prettyjson")},113:e=>{e.exports=require("crypto")},147:e=>{e.exports=require("fs")},598:e=>{e.exports=JSON.parse('{"name":"@capgo/cli","version":"0.10.1","description":"A CLI to upload to capgo servers","main":"dist/index.js","bin":{"capgo":"dist/index.js"},"repository":{"type":"git","url":"git+https://github.com/Cap-go/capgo-cli.git"},"bugs":{"url":"https://github.com/Cap-go/capgo-cli/issues"},"keywords":["appflow alternative","ionic","capacitor","auto update","live update","capgo","cli","upload","capgo-cli"],"scripts":{"dev":"set NODE_ENV=development&& npx webpack --config webpack.config.js","no-debug":"node dist/index.js","build":"set NODE_ENV=production&& npx webpack --config webpack.config.js","pack":"pkg","test_rls":"ts-node ./test/test_headers_rls.ts","lint":"eslint . --ext .ts --fix"},"author":"github.com/riderx","license":"Apache 2.0","dependencies":{"@capacitor/cli":"3.5.1","@supabase/supabase-js":"^1.35.3","adm-zip":"^0.5.9","cli-progress":"3.11.0","commander":"9.2.0","form-data":"^4.0.0","fs-extra":"10.1.0","mime":"^3.0.0","node-stream-zip":"^1.15.0","prettyjson":"^1.2.5","upath":"^2.0.1"},"devDependencies":{"@types/adm-zip":"0.5.0","@types/cli-progress":"^3.11.0","@types/fs-extra":"^9.0.13","@types/mime":"^2.0.3","@types/node":"^17.0.31","@types/prettyjson":"^0.0.30","@typescript-eslint/eslint-plugin":"5.22.0","@typescript-eslint/parser":"5.22.0","eslint":"8.14.0","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^8.5.0","eslint-import-resolver-typescript":"2.7.1","eslint-plugin-import":"2.26.0","eslint-plugin-prettier":"^4.0.0","git-format-staged":"3.0.0","husky":"^7.0.4","nodemon":"2.0.16","pkg":"5.6.0","prettier":"2.6.2","ts-loader":"^9.3.0","ts-node":"^10.7.0","tsconfig-paths":"4.0.0","typescript":"4.6.4","webpack":"5.72.0","webpack-cli":"^4.9.2","webpack-node-externals":"^3.0.0"}}')}},o={};!function r(t){var a=o[t];if(void 0!==a)return a.exports;var n=o[t]={exports:{}};return e[t].call(n.exports,n,n.exports,r),n.exports}(473)})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "description": "A CLI to upload to capgo servers",
   "main": "dist/index.js",
   "bin": {
@@ -29,15 +29,15 @@
     "no-debug": "node dist/index.js",
     "build": "set NODE_ENV=production&& npx webpack --config webpack.config.js",
     "pack": "pkg",
+    "test_rls": "ts-node ./test/test_headers_rls.ts",
     "lint": "eslint . --ext .ts --fix"
   },
   "author": "github.com/riderx",
   "license": "Apache 2.0",
   "dependencies": {
     "@capacitor/cli": "3.5.1",
+    "@supabase/supabase-js": "^1.35.3",
     "adm-zip": "^0.5.9",
-    "axios": "0.27.2",
-    "axios-retry": "^3.2.5",
     "cli-progress": "3.11.0",
     "commander": "9.2.0",
     "form-data": "^4.0.0",

package/src/bin/add.ts

@@ -1,17 +1,11 @@
-import axios from 'axios';
-import prettyjson from 'prettyjson';
 import { program } from 'commander';
+import { randomUUID } from 'crypto';
 import { readFileSync } from 'fs';
 import { existsSync } from 'fs-extra';
 import { getType } from 'mime';
-import { getConfig, hostSupa, supaAnon } from './utils';
+import { definitions } from './types_supabase'
+import { getConfig, createSupabaseClient, formatError } from './utils';
 
-interface AppAdd {
-  appid: string;
-  name: string;
-  icon?: string;
-  iconType?: string;
-}
 interface Options {
   apikey: string;
   name?: string;
@@ -32,43 +26,84 @@ export const addApp = async (appid: string, options: Options) => {
     program.error("Missing argument, you need to provide a appid and a name, or be in a capacitor project");
   }
   console.log(`Add ${appid} to Capgo`);
-  let res;
+
+  const supabase = createSupabaseClient(apikey)
+
+  // checking if user has access before uploading image
+  const { data: apiAccess, error: apiAccessError } = await supabase
+    .rpc('is_allowed_capgkey', { apikey, keymode: ['write', 'all'] })
+
+  if (!apiAccess || apiAccessError) {
+    console.log('Invalid API key or insufisant rights');
+    return
+  }
+
   console.log('Adding...');
-  const data: AppAdd = { appid, name }
+  let iconBuff;
+  let iconType;
+
   if (icon && existsSync(icon)) {
-    const iconBuff = readFileSync(icon);
+    iconBuff = readFileSync(icon);
     const contentType = getType(icon);
-    data.icon = iconBuff.toString('base64');
-    data.iconType = contentType || 'image/png';
+    iconType = contentType || 'image/png';
+    console.warn(`Found app icon ${icon}`);
   }
   else if (existsSync(newIconPath)) {
-    const iconBuff = readFileSync(newIconPath);
+    iconBuff = readFileSync(newIconPath);
     const contentType = getType(newIconPath);
-    data.icon = iconBuff.toString('base64');
-    data.iconType = contentType || 'image/png';
+    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}`);
   }
-  try {
-    res = await axios({
-      method: 'POST',
-      url: `${hostSupa}/add`,
-      data,
-      validateStatus: () => true,
-      headers: {
-        'apikey': apikey,
-        'authorization': `Bearer ${supaAnon}`
-      }
-    })
-  } catch (err) {
-    if (axios.isAxiosError(err) && err.response) {
-      program.error(`Network Error \n${prettyjson.render(err.response?.data)}`);
-    } else {
-      program.error(`Unknow error \n${prettyjson.render(err)}`);
+
+  const { data: dataUser, error: userIdError } = await supabase
+    .rpc<string>('get_user_id', { apikey })
+
+  const userId = dataUser ? dataUser.toString() : '';
+
+  if (!userId || userIdError) {
+    program.error(`Cannot verify user ${formatError(userIdError)}`);
+  }
+
+  // check if app already exist
+  const { data: app, error: dbError0 } = await supabase
+    .rpc<string>('exist_app', { appid, apikey })
+  if (app || dbError0) {
+    program.error(`App already exists ${formatError(dbError0)}`)
+  }
+
+  const fileName = `icon_${randomUUID()}`
+  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}`)
+      .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
   }
-  if (!res || res.status !== 200) {
-    program.error(`Server Error \n${prettyjson.render(res.data)}`);
+
+  // add app to db
+  const { error: dbError } = await supabase
+    .from<definitions['apps']>('apps')
+    .insert({
+      icon_url: signedURL,
+      user_id: userId,
+      name,
+      app_id: appid,
+    }, { returning: "minimal" })
+  if (dbError) {
+    program.error(`Could not add app ${formatError(dbError)}`);
   }
   console.log("App added to server, you can upload a version now")
 }

package/src/bin/delete.ts

@@ -1,7 +1,6 @@
-import axios from 'axios';
-import prettyjson from 'prettyjson';
 import { program } from 'commander';
-import { supaAnon, hostSupa, getConfig } from './utils';
+import { getConfig, createSupabaseClient, formatError } from './utils';
+import { definitions } from './types_supabase'
 
 interface Options {
   apikey: string;
@@ -19,28 +18,125 @@ export const deleteApp = async (appid: string, options: Options) => {
     program.error('Missing argument, you need to provide a appid, or be in a capacitor project');
   }
   console.log(`Delete ${appid} to Capgo`);
-  let res;
-  try {
-    console.log('Deleting...');
-    res = await axios({
-      method: 'POST',
-      url: `${hostSupa}/delete`,
-      data: { appid, version },
-      validateStatus: () => true,
-      headers: {
-        'apikey': apikey,
-        'authorization': `Bearer ${supaAnon}`
-      }
-    })
-  } catch (err) {
-    if (axios.isAxiosError(err) && err.response) {
-      program.error(`Network Error \n${prettyjson.render(err.response?.data)}`);
-    } else {
-      program.error(`Unknow error \n${prettyjson.render(err)}`);
+
+  const supabase = createSupabaseClient(apikey)
+
+  // checking if user has access rights before deleting
+  const { data: apiAccess, error: apiAccessError } = await supabase
+    .rpc('is_allowed_capgkey', { apikey, keymode: ['write', 'all'], app_id: appid })
+
+  if (!apiAccess || apiAccessError) {
+    console.log('Invalid API key or insufisant rights');
+    return
+  }
+
+  const { data: dataUser, error: userIdError } = await supabase
+    .rpc<string>('get_user_id', { apikey })
+
+  const userId = dataUser ? dataUser.toString() : '';
+
+  if (!userId || userIdError) {
+    program.error(`Cannot verify user ${formatError(userIdError)}`);
+  }
+
+  const { data: app, error: dbError0 } = await supabase
+    .rpc<string>('exist_app', { appid, apikey })
+  if (!app || dbError0) {
+    program.error('No permission to delete')
+  }
+
+  if (version) {
+    const { data: versions, error: versionIdError } = await supabase
+      .from<definitions['app_versions']>('app_versions')
+      .select()
+      .eq('app_id', appid)
+      .eq('user_id', userId)
+      .eq('name', version)
+      .eq('deleted', false)
+    if (!versions || !versions.length || versionIdError) {
+      program.error(`Version ${appid}@${version} don't exist ${formatError(versionIdError)}`)
+    }
+    const { data: channelFound, error: errorChannel } = await supabase
+      .from<definitions['channels']>('channels')
+      .select()
+      .eq('app_id', appid)
+      .eq('created_by', userId)
+      .eq('version', versions[0].id)
+    if ((channelFound && channelFound.length) || errorChannel) {
+      program.error(`Version ${appid}@${version} is used in a channel, unlink it first ${formatError(errorChannel)}`)
+    }
+    const { data: deviceFound, error: errorDevice } = await supabase
+      .from<definitions['devices_override']>('devices_override')
+      .select()
+      .eq('app_id', appid)
+      .eq('version', versions[0].id)
+    if ((deviceFound && deviceFound.length) || errorDevice) {
+      program.error(`Version ${appid} @${version} is used in a device override, unlink it first ${formatError(errorDevice)}`)
+    }
+    // Delete only a specific version in storage
+    const { error: delError } = await supabase
+      .storage
+      .from('apps')
+      .remove([`${userId} /${appid}/versions / ${versions[0].bucket_id} `])
+    if (delError) {
+      program.error(`Something went wrong when trying to delete ${appid} @${version} ${delError} `)
+    }
+
+    const { error: delAppSpecVersionError } = await supabase
+      .from<definitions['app_versions']>('app_versions')
+      .update({
+        deleted: true,
+      })
+      .eq('app_id', appid)
+      .eq('name', version)
+      .eq('user_id', userId)
+    if (delAppSpecVersionError) {
+      program.error(`App ${appid} @${version} not found in database ${delAppSpecVersionError} `)
+    }
+    console.log("App version deleted from server")
+    return
+  }
+
+  const { data, error: vError } = await supabase
+    .from<definitions['app_versions']>('app_versions')
+    .select()
+    .eq('app_id', appid)
+    .eq('user_id', userId)
+
+  if (vError) {
+    program.error(`App ${appid} not found in database ${vError} `)
+  }
+
+  if (data && data.length) {
+    const filesToRemove = data.map(x => `${userId} /${appid}/versions / ${x.bucket_id} `)
+    const { error: delError } = await supabase
+      .storage
+      .from('apps')
+      .remove(filesToRemove)
+    if (delError) {
+      program.error(`Cannot delete stored version for app ${appid} from storage ${delError} `)
     }
   }
-  if (!res || res.status !== 200) {
-    program.error(`Server Error \n${prettyjson.render(res.data)}`);
+
+  const { error: delAppVersionError } = await supabase
+    .from<definitions['app_versions']>('app_versions')
+    .delete()
+    .eq('app_id', appid)
+    .eq('user_id', userId)
+
+  if (delAppVersionError) {
+    program.error(`Cannot delete version for app ${appid} from database ${delAppVersionError} `)
   }
-  console.log("App deleted to server")
+
+  const { error: dbAppError } = await supabase
+    .from<definitions['apps']>('apps')
+    .delete()
+    .eq('app_id', appid)
+    .eq('user_id', userId)
+
+  if (dbAppError) {
+    program.error(`Cannot delete from database ${dbAppError} `)
+  }
+
+  console.log("App deleted from server")
 }

package/src/bin/set.ts

@@ -1,7 +1,6 @@
-import axios from 'axios';
-import prettyjson from 'prettyjson';
 import { program } from 'commander';
-import { getConfig, host, hostSupa, supaAnon } from './utils';
+import { getConfig, createSupabaseClient, updateOrCreateChannel, host, formatError } from './utils';
+import { definitions } from './types_supabase';
 
 interface Options {
   apikey: string;
@@ -14,7 +13,6 @@ export const setChannel = async (appid: string, options: Options) => {
   let { version } = options;
   const { apikey, state, channel = 'dev' } = options;
   const config = await getConfig();
-  let res;
   appid = appid || config?.app?.appId
   version = version || config?.app?.package?.version
   let parsedState
@@ -35,30 +33,50 @@ export const setChannel = async (appid: string, options: Options) => {
     console.log(`Set${channel} to @${state} in ${appid}`);
   }
   try {
-    res = await axios({
-      method: 'POST',
-      url: `${hostSupa}/channel`,
-      data: {
-        version,
-        public: parsedState,
-        appid,
-        channel,
-      },
-      validateStatus: () => true,
-      headers: {
-        'apikey': apikey,
-        'authorization': `Bearer ${supaAnon}`
-      }
-    })
-  } catch (err) {
-    if (axios.isAxiosError(err) && err.response) {
-      program.error(`Network Error \n${prettyjson.render(err.response?.data)}`);
-    } else {
-      program.error(`Unknow error \n${prettyjson.render(err)}`);
+    const supabase = createSupabaseClient(apikey)
+    const { data: apiAccess, error: apiAccessError } = await supabase
+      .rpc('is_allowed_capgkey', { apikey, keymode: ['write', 'all'], app_id: appid })
+
+    if (!apiAccess || apiAccessError) {
+      program.error("Invalid API key or insufisant rights");
     }
-  }
-  if (!res || res.status !== 200) {
-    program.error(`Server Error \n${prettyjson.render(res.data)}`);
+    const { data: dataUser, error: userIdError } = await supabase
+      .rpc<string>('get_user_id', { apikey })
+
+    const userId = dataUser ? dataUser.toString() : '';
+
+    if (!userId || userIdError) {
+      program.error('Cannot verify user')
+    }
+    const channelPayload: Partial<definitions['channels']> = {
+      created_by: userId,
+      app_id: appid,
+      name: channel,
+    }
+    if (version) {
+      const { data, error: vError } = await supabase
+        .from<definitions['app_versions']>('app_versions')
+        .select()
+        .eq('app_id', appid)
+        .eq('name', version)
+        .eq('user_id', userId)
+        .eq('deleted', false)
+      if (vError || !data || !data.length)
+        program.error(`Cannot find version ${version}`);
+      channelPayload.version = data[0].id
+    }
+    if (parsedState !== undefined)
+      channelPayload.public = parsedState
+    try {
+      const { error: dbError } = await updateOrCreateChannel(supabase, channelPayload, apikey)
+      if (dbError)
+        program.error(`Cannot set channel ${formatError(dbError)}`);
+    }
+    catch (e) {
+      program.error(`Cannot set channel ${formatError(e)}`);
+    }
+  } catch (err) {
+    program.error(`Unknow error ${formatError(err)}`);
   }
   if (version) {
     console.log(`Done ✅`);