@capgo/cli 0.9.0 → 0.11.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/.cz.toml CHANGED
@@ -1,7 +1,7 @@
1
1
  [tool.commitizen]
2
2
  name = "cz_conventional_commits"
3
3
  tag_format = "$major.$minor.$patch$prerelease"
4
- version = "0.9.0"
4
+ version = "0.11.1"
5
5
  version_files = [
6
6
  "package.json:version",
7
7
  ".cz.toml"
package/.eslintignore CHANGED
@@ -1,3 +1,4 @@
1
1
  dist
2
2
  test
3
3
  webpack.config.js
4
+ src/bin/types_supabase.ts
package/CHANGELOG.md CHANGED
@@ -1,3 +1,37 @@
1
+ ## 0.11.1 (2022-06-01)
2
+
3
+ ### Fix
4
+
5
+ - add check if version exist
6
+
7
+ ## 0.11.0 (2022-06-01)
8
+
9
+ ### Feat
10
+
11
+ - add login system
12
+
13
+ ## 0.10.1 (2022-06-01)
14
+
15
+ ### Fix
16
+
17
+ - lint issue
18
+
19
+ ## 0.10.0 (2022-06-01)
20
+
21
+ ### Fix
22
+
23
+ - remove useless import
24
+ - types
25
+ - error message system
26
+ - remove old deps
27
+ - add back limit in upload
28
+ - right issue in cli
29
+ - upload issue
30
+ - upload
31
+ - add method
32
+ - replace all console.error by program exit
33
+ - lint + do set
34
+
1
35
  ## 0.9.0 (2022-05-24)
2
36
 
3
37
  ### Fix
package/dist/index.js CHANGED
@@ -1,2 +1,2 @@
1
1
  #!/usr/bin/env node
2
- (()=>{"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)})();
2
+ (()=>{"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(n,a){function i(e){try{s(t.next(e))}catch(e){a(e)}}function p(e){try{s(t.throw(e))}catch(e){a(e)}}function s(e){var o;e.done?n(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 n=r(304),a=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 m=o.apikey||(0,d.findSavedKey)(),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||n.program.error("Missing API key, you need to provide a API key to add your app"),e&&c||n.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 f=(0,d.createSupabaseClient)(m),{data:y,error:v}=yield f.rpc("is_allowed_capgkey",{apikey:m,keymode:["write","all"]});if(!y||v)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 f.rpc("get_user_id",{apikey:m}),$=k?k.toString():"";$&&!b||n.program.error(`Cannot verify user ${(0,d.formatError)(b)}`);const{data:w,error:x}=yield f.rpc("exist_app",{appid:e,apikey:m});(w||x)&&n.program.error(`App already exists ${(0,d.formatError)(x)}`);const C=`icon_${(0,a.randomUUID)()}`;let q="https://xvwzpoazmxkqosrdewyv.supabase.co/storage/v1/object/public/images/capgo.png";if(h&&_){const{error:o}=yield f.storage.from(`images/${$}/${e}`).upload(C,h,{contentType:_});o&&n.program.error(`Could not add app ${(0,d.formatError)(o)}`);const{data:r}=yield f.storage.from(`images/${$}/${e}`).getPublicUrl(C);q=(null==r?void 0:r.publicURL)||q}const{error:I}=yield f.from("apps").insert({icon_url:q,user_id:$,name:c,app_id:e},{returning:"minimal"});I&&n.program.error(`Could not add app ${(0,d.formatError)(I)}`),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(n,a){function i(e){try{s(t.next(e))}catch(e){a(e)}}function p(e){try{s(t.throw(e))}catch(e){a(e)}}function s(e){var o;e.done?n(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 n=r(304),a=r(233);o.deleteApp=(e,o)=>t(void 0,void 0,void 0,(function*(){var r;const{version:t}=o,i=o.apikey||(0,a.findSavedKey)(),p=yield(0,a.getConfig)();e=e||(null===(r=null==p?void 0:p.app)||void 0===r?void 0:r.appId),i||n.program.error("Missing API key, you need to provide an API key to delete your app"),e||n.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,a.createSupabaseClient)(i),{data:d,error:l}=yield s.rpc("is_allowed_capgkey",{apikey:i,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:i}),m=c?c.toString():"";m&&!u||n.program.error(`Cannot verify user ${(0,a.formatError)(u)}`);const{data:g,error:f}=yield s.rpc("exist_app",{appid:e,apikey:i});if(g&&!f||n.program.error("No permission to delete"),t){const{data:o,error:r}=yield s.from("app_versions").select().eq("app_id",e).eq("user_id",m).eq("name",t).eq("deleted",!1);o&&o.length&&!r||n.program.error(`Version ${e}@${t} don't exist ${(0,a.formatError)(r)}`);const{data:i,error:p}=yield s.from("channels").select().eq("app_id",e).eq("created_by",m).eq("version",o[0].id);(i&&i.length||p)&&n.program.error(`Version ${e}@${t} is used in a channel, unlink it first ${(0,a.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)&&n.program.error(`Version ${e} @${t} is used in a device override, unlink it first ${(0,a.formatError)(l)}`);const{error:c}=yield s.storage.from("apps").remove([`${m} /${e}/versions / ${o[0].bucket_id} `]);c&&n.program.error(`Something went wrong when trying to delete ${e} @${t} ${c} `);const{error:u}=yield s.from("app_versions").update({deleted:!0}).eq("app_id",e).eq("name",t).eq("user_id",m);return u&&n.program.error(`App ${e} @${t} not found in database ${u} `),void console.log("App version deleted from server")}const{data:y,error:v}=yield s.from("app_versions").select().eq("app_id",e).eq("user_id",m);if(v&&n.program.error(`App ${e} not found in database ${v} `),y&&y.length){const o=y.map((o=>`${m} /${e}/versions / ${o.bucket_id} `)),{error:r}=yield s.storage.from("apps").remove(o);r&&n.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&&n.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);_&&n.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 n=r(304),a=r(548),i=r(453),p=r(666),s=r(310),d=t(r(598)),l=r(937);n.program.version(d.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.version(d.default.version).command("login [apikey]").alias("l").action(l.login).option("--local","Only save in local folder"),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("d").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)},937:function(e,o,r){var t=this&&this.__awaiter||function(e,o,r,t){return new(r||(r=Promise))((function(n,a){function i(e){try{s(t.next(e))}catch(e){a(e)}}function p(e){try{s(t.throw(e))}catch(e){a(e)}}function s(e){var o;e.done?n(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())}))},n=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(o,"__esModule",{value:!0}),o.login=void 0;const a=r(304),i=n(r(147)),p=n(r(37));o.login=(e,o)=>t(void 0,void 0,void 0,(function*(){const{local:r}=o;if(r)i.default.existsSync(".git")||a.program.error("To use local you should be in a git repository"),i.default.writeFileSync(".capgo",`${e}\n`),i.default.appendFileSync(".gitignore",".capgo\n");else{const o=p.default.homedir();i.default.writeFileSync(`${o}/.capgo`,`${e}\n`)}console.log(`login saved into .capgo file in ${r?"local":"home"} directory`)}))},666:function(e,o,r){var t=this&&this.__awaiter||function(e,o,r,t){return new(r||(r=Promise))((function(n,a){function i(e){try{s(t.next(e))}catch(e){a(e)}}function p(e){try{s(t.throw(e))}catch(e){a(e)}}function s(e){var o;e.done?n(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 n=r(304),a=r(233);o.setChannel=(e,o)=>t(void 0,void 0,void 0,(function*(){var r,t,i;let{version:p}=o;const{state:s,channel:d="dev"}=o,l=o.apikey||(0,a.findSavedKey)(),c=yield(0,a.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"!==s&&"private"!==s||(u="public"===s),l||n.program.error("Missing API key, you need to provide a API key to add your app"),e||n.program.error("Missing argument, you need to provide a appid, or be in a capacitor project"),p||u||n.program.error("Missing argument, you need to provide a state or a version"),p?console.log(`Set ${d} to @${p} in ${e}`):console.log(`Set${d} to @${s} in ${e}`);try{const o=(0,a.createSupabaseClient)(l),{data:r,error:t}=yield o.rpc("is_allowed_capgkey",{apikey:l,keymode:["write","all"],app_id:e});r&&!t||n.program.error("Invalid API key or insufisant rights");const{data:i,error:s}=yield o.rpc("get_user_id",{apikey:l}),c=i?i.toString():"";c&&!s||n.program.error("Cannot verify user");const m={created_by:c,app_id:e,name:d};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||n.program.error(`Cannot find version ${p}`),m.version=r[0].id}void 0!==u&&(m.public=u);try{const{error:e}=yield(0,a.updateOrCreateChannel)(o,m,l);e&&n.program.error(`Cannot set channel ${(0,a.formatError)(e)}`)}catch(e){n.program.error(`Cannot set channel ${(0,a.formatError)(e)}`)}}catch(e){n.program.error(`Unknow error ${(0,a.formatError)(e)}`)}p?console.log("Done ✅"):console.log(`You can use now is channel in your app with the url: ${a.host}/api/latest?appid=${e}&channel=${d}`)}))},310:function(e,o,r){var t=this&&this.__awaiter||function(e,o,r,t){return new(r||(r=Promise))((function(n,a){function i(e){try{s(t.next(e))}catch(e){a(e)}}function p(e){try{s(t.throw(e))}catch(e){a(e)}}function s(e){var o;e.done?n(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())}))},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(r(844)),i=r(304),p=r(113),s=n(r(295)),d=r(233);o.uploadVersion=(e,o)=>t(void 0,void 0,void 0,(function*(){var r,t,n,l;let{version:c,path:u,channel:m}=o;const{external:g}=o,f=o.apikey||(0,d.findSavedKey)();m=m||"dev";const y=yield(0,d.getConfig)();e=e||(null===(r=null==y?void 0:y.app)||void 0===r?void 0:r.appId),c=c||(null===(n=null===(t=null==y?void 0:y.app)||void 0===t?void 0:t.package)||void 0===n?void 0:n.version),u=u||(null===(l=null==y?void 0:y.app)||void 0===l?void 0:l.webDir),f||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 v=(0,d.createSupabaseClient)(f),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 v.rpc("is_allowed_capgkey",{apikey:f,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 v.rpc("exist_app_versions",{apikey:f,version_name:c,appid:e});($||w)&&(h.stop(),i.program.error(`This app version already exist ${(0,d.formatError)(w)}`)),_.increment();const{data:x,error:C}=yield v.rpc("get_user_id",{apikey:f}),q=x?x.toString():"";q&&!C||(h.stop(),i.program.error(`Cannot verify user ${(0,d.formatError)(C)}`)),_.increment();const{data:I,error:S}=yield v.rpc("exist_app",{appid:e,apikey:f});if(I&&!S||(h.stop(),i.program.error(`Cannot find app ${e} in your account \n${(0,d.formatError)(S)}`)),_.increment(),g)g&&!g.startsWith("https://")&&(h.stop(),i.program.error(`External link should should start with "https://" current is "${g}"`));else{const o=new a.default;o.addLocalFolder(u);const r=o.toBuffer(),t=Math.floor(r.byteLength/1024/1024),n=`apps/${q}/${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 v.storage.from(n).upload(s,r,{contentType:"application/zip"});l&&(h.stop(),i.program.error(`Cannot upload ${(0,d.formatError)(l)}`))}_.increment();const A=(0,p.randomUUID)(),{data:M,error:P}=yield(0,d.updateOrCreateVersion)(v,{bucket_id:g?void 0:A,user_id:q,name:c,app_id:e,external_url:g},f);if(P&&(h.stop(),i.program.error(`Cannot add version ${(0,d.formatError)(P)}`)),_.increment(),M&&M.length){const{error:o}=yield(0,d.updateOrCreateChannel)(v,{name:m,app_id:e,created_by:q,version:M[0].id},f);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(n,a){function i(e){try{s(t.next(e))}catch(e){a(e)}}function p(e){try{s(t.throw(e))}catch(e){a(e)}}function s(e){var o;e.done?n(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())}))},n=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.findSavedKey=o.createSupabaseClient=o.supaAnon=o.hostSupa=o.hostWeb=o.host=void 0;const a=r(778),i=r(304),p=r(885),s=n(r(867)),d=n(r(147)),l=n(r(37));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.findSavedKey=()=>{let e=`${l.default.homedir()}/.capgo`;return d.default.existsSync(e)?d.default.readFileSync(e,"utf8").trim():(e=".capgo",d.default.existsSync(e)?d.default.readFileSync(e,"utf8").trim():null)},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,a.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:n}=yield e.rpc("exist_app_versions",{appid:o.app_id,name_version:o.name,apikey:r});return t&&!n?(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:n}=yield e.rpc("exist_channel",{appid:o.app_id,name_channel:o.name,apikey:r});return t&&!n?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")},37:e=>{e.exports=require("os")},598:e=>{e.exports=JSON.parse('{"name":"@capgo/cli","version":"0.11.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 n=o[t];if(void 0!==n)return n.exports;var a=o[t]={exports:{}};return e[t].call(a.exports,a,a.exports,r),a.exports}(473)})();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@capgo/cli",
3
- "version": "0.9.0",
3
+ "version": "0.11.1",
4
4
  "description": "A CLI to upload to capgo servers",
5
5
  "main": "dist/index.js",
6
6
  "bin": {
@@ -29,15 +29,15 @@
29
29
  "no-debug": "node dist/index.js",
30
30
  "build": "set NODE_ENV=production&& npx webpack --config webpack.config.js",
31
31
  "pack": "pkg",
32
+ "test_rls": "ts-node ./test/test_headers_rls.ts",
32
33
  "lint": "eslint . --ext .ts --fix"
33
34
  },
34
35
  "author": "github.com/riderx",
35
36
  "license": "Apache 2.0",
36
37
  "dependencies": {
37
38
  "@capacitor/cli": "3.5.1",
39
+ "@supabase/supabase-js": "^1.35.3",
38
40
  "adm-zip": "^0.5.9",
39
- "axios": "0.27.2",
40
- "axios-retry": "^3.2.5",
41
41
  "cli-progress": "3.11.0",
42
42
  "commander": "9.2.0",
43
43
  "form-data": "^4.0.0",
package/src/bin/add.ts CHANGED
@@ -1,17 +1,11 @@
1
- import axios from 'axios';
2
- import prettyjson from 'prettyjson';
3
1
  import { program } from 'commander';
2
+ import { randomUUID } from 'crypto';
4
3
  import { readFileSync } from 'fs';
5
4
  import { existsSync } from 'fs-extra';
6
5
  import { getType } from 'mime';
7
- import { getConfig, hostSupa, supaAnon } from './utils';
6
+ import { definitions } from './types_supabase'
7
+ import { getConfig, createSupabaseClient, formatError, findSavedKey } from './utils';
8
8
 
9
- interface AppAdd {
10
- appid: string;
11
- name: string;
12
- icon?: string;
13
- iconType?: string;
14
- }
15
9
  interface Options {
16
10
  apikey: string;
17
11
  name?: string;
@@ -20,7 +14,7 @@ interface Options {
20
14
  const newIconPath = "assets/icon.png"
21
15
  export const addApp = async (appid: string, options: Options) => {
22
16
  let { name, icon } = options;
23
- const { apikey } = options;
17
+ const apikey = options.apikey || findSavedKey()
24
18
  const config = await getConfig();
25
19
  appid = appid || config?.app?.appId
26
20
  name = name || config?.app?.appName || 'Unknown'
@@ -32,43 +26,84 @@ export const addApp = async (appid: string, options: Options) => {
32
26
  program.error("Missing argument, you need to provide a appid and a name, or be in a capacitor project");
33
27
  }
34
28
  console.log(`Add ${appid} to Capgo`);
35
- let res;
29
+
30
+ const supabase = createSupabaseClient(apikey)
31
+
32
+ // checking if user has access before uploading image
33
+ const { data: apiAccess, error: apiAccessError } = await supabase
34
+ .rpc('is_allowed_capgkey', { apikey, keymode: ['write', 'all'] })
35
+
36
+ if (!apiAccess || apiAccessError) {
37
+ console.log('Invalid API key or insufisant rights');
38
+ return
39
+ }
40
+
36
41
  console.log('Adding...');
37
- const data: AppAdd = { appid, name }
42
+ let iconBuff;
43
+ let iconType;
44
+
38
45
  if (icon && existsSync(icon)) {
39
- const iconBuff = readFileSync(icon);
46
+ iconBuff = readFileSync(icon);
40
47
  const contentType = getType(icon);
41
- data.icon = iconBuff.toString('base64');
42
- data.iconType = contentType || 'image/png';
48
+ iconType = contentType || 'image/png';
49
+ console.warn(`Found app icon ${icon}`);
43
50
  }
44
51
  else if (existsSync(newIconPath)) {
45
- const iconBuff = readFileSync(newIconPath);
52
+ iconBuff = readFileSync(newIconPath);
46
53
  const contentType = getType(newIconPath);
47
- data.icon = iconBuff.toString('base64');
48
- data.iconType = contentType || 'image/png';
54
+ iconType = contentType || 'image/png';
55
+ console.warn(`Found app icon ${newIconPath}`);
49
56
  } else {
50
57
  console.warn(`Cannot find app icon in any of the following locations: ${icon}, ${newIconPath}`);
51
58
  }
52
- try {
53
- res = await axios({
54
- method: 'POST',
55
- url: `${hostSupa}/add`,
56
- data,
57
- validateStatus: () => true,
58
- headers: {
59
- 'apikey': apikey,
60
- 'authorization': `Bearer ${supaAnon}`
61
- }
62
- })
63
- } catch (err) {
64
- if (axios.isAxiosError(err) && err.response) {
65
- program.error(`Network Error \n${prettyjson.render(err.response?.data)}`);
66
- } else {
67
- program.error(`Unknow error \n${prettyjson.render(err)}`);
59
+
60
+ const { data: dataUser, error: userIdError } = await supabase
61
+ .rpc<string>('get_user_id', { apikey })
62
+
63
+ const userId = dataUser ? dataUser.toString() : '';
64
+
65
+ if (!userId || userIdError) {
66
+ program.error(`Cannot verify user ${formatError(userIdError)}`);
67
+ }
68
+
69
+ // check if app already exist
70
+ const { data: app, error: dbError0 } = await supabase
71
+ .rpc<string>('exist_app', { appid, apikey })
72
+ if (app || dbError0) {
73
+ program.error(`App already exists ${formatError(dbError0)}`)
74
+ }
75
+
76
+ const fileName = `icon_${randomUUID()}`
77
+ let signedURL = 'https://xvwzpoazmxkqosrdewyv.supabase.co/storage/v1/object/public/images/capgo.png'
78
+
79
+ // upload image if available
80
+ if (iconBuff && iconType) {
81
+ const { error } = await supabase.storage
82
+ .from(`images/${userId}/${appid}`)
83
+ .upload(fileName, iconBuff, {
84
+ contentType: iconType,
85
+ })
86
+ if (error) {
87
+ program.error(`Could not add app ${formatError(error)}`);
68
88
  }
89
+ const { data: signedURLData } = await supabase
90
+ .storage
91
+ .from(`images/${userId}/${appid}`)
92
+ .getPublicUrl(fileName)
93
+ signedURL = signedURLData?.publicURL || signedURL
69
94
  }
70
- if (!res || res.status !== 200) {
71
- program.error(`Server Error \n${prettyjson.render(res.data)}`);
95
+
96
+ // add app to db
97
+ const { error: dbError } = await supabase
98
+ .from<definitions['apps']>('apps')
99
+ .insert({
100
+ icon_url: signedURL,
101
+ user_id: userId,
102
+ name,
103
+ app_id: appid,
104
+ }, { returning: "minimal" })
105
+ if (dbError) {
106
+ program.error(`Could not add app ${formatError(dbError)}`);
72
107
  }
73
108
  console.log("App added to server, you can upload a version now")
74
109
  }
package/src/bin/delete.ts CHANGED
@@ -1,7 +1,6 @@
1
- import axios from 'axios';
2
- import prettyjson from 'prettyjson';
3
1
  import { program } from 'commander';
4
- import { supaAnon, hostSupa, getConfig } from './utils';
2
+ import { getConfig, createSupabaseClient, formatError, findSavedKey } from './utils';
3
+ import { definitions } from './types_supabase'
5
4
 
6
5
  interface Options {
7
6
  apikey: string;
@@ -9,7 +8,8 @@ interface Options {
9
8
  }
10
9
 
11
10
  export const deleteApp = async (appid: string, options: Options) => {
12
- const { apikey, version } = options;
11
+ const { version } = options;
12
+ const apikey = options.apikey || findSavedKey()
13
13
  const config = await getConfig();
14
14
  appid = appid || config?.app?.appId
15
15
  if (!apikey) {
@@ -19,28 +19,125 @@ export const deleteApp = async (appid: string, options: Options) => {
19
19
  program.error('Missing argument, you need to provide a appid, or be in a capacitor project');
20
20
  }
21
21
  console.log(`Delete ${appid} to Capgo`);
22
- let res;
23
- try {
24
- console.log('Deleting...');
25
- res = await axios({
26
- method: 'POST',
27
- url: `${hostSupa}/delete`,
28
- data: { appid, version },
29
- validateStatus: () => true,
30
- headers: {
31
- 'apikey': apikey,
32
- 'authorization': `Bearer ${supaAnon}`
33
- }
34
- })
35
- } catch (err) {
36
- if (axios.isAxiosError(err) && err.response) {
37
- program.error(`Network Error \n${prettyjson.render(err.response?.data)}`);
38
- } else {
39
- program.error(`Unknow error \n${prettyjson.render(err)}`);
22
+
23
+ const supabase = createSupabaseClient(apikey)
24
+
25
+ // checking if user has access rights before deleting
26
+ const { data: apiAccess, error: apiAccessError } = await supabase
27
+ .rpc('is_allowed_capgkey', { apikey, keymode: ['write', 'all'], app_id: appid })
28
+
29
+ if (!apiAccess || apiAccessError) {
30
+ console.log('Invalid API key or insufisant rights');
31
+ return
32
+ }
33
+
34
+ const { data: dataUser, error: userIdError } = await supabase
35
+ .rpc<string>('get_user_id', { apikey })
36
+
37
+ const userId = dataUser ? dataUser.toString() : '';
38
+
39
+ if (!userId || userIdError) {
40
+ program.error(`Cannot verify user ${formatError(userIdError)}`);
41
+ }
42
+
43
+ const { data: app, error: dbError0 } = await supabase
44
+ .rpc<string>('exist_app', { appid, apikey })
45
+ if (!app || dbError0) {
46
+ program.error('No permission to delete')
47
+ }
48
+
49
+ if (version) {
50
+ const { data: versions, error: versionIdError } = await supabase
51
+ .from<definitions['app_versions']>('app_versions')
52
+ .select()
53
+ .eq('app_id', appid)
54
+ .eq('user_id', userId)
55
+ .eq('name', version)
56
+ .eq('deleted', false)
57
+ if (!versions || !versions.length || versionIdError) {
58
+ program.error(`Version ${appid}@${version} don't exist ${formatError(versionIdError)}`)
59
+ }
60
+ const { data: channelFound, error: errorChannel } = await supabase
61
+ .from<definitions['channels']>('channels')
62
+ .select()
63
+ .eq('app_id', appid)
64
+ .eq('created_by', userId)
65
+ .eq('version', versions[0].id)
66
+ if ((channelFound && channelFound.length) || errorChannel) {
67
+ program.error(`Version ${appid}@${version} is used in a channel, unlink it first ${formatError(errorChannel)}`)
68
+ }
69
+ const { data: deviceFound, error: errorDevice } = await supabase
70
+ .from<definitions['devices_override']>('devices_override')
71
+ .select()
72
+ .eq('app_id', appid)
73
+ .eq('version', versions[0].id)
74
+ if ((deviceFound && deviceFound.length) || errorDevice) {
75
+ program.error(`Version ${appid} @${version} is used in a device override, unlink it first ${formatError(errorDevice)}`)
76
+ }
77
+ // Delete only a specific version in storage
78
+ const { error: delError } = await supabase
79
+ .storage
80
+ .from('apps')
81
+ .remove([`${userId} /${appid}/versions / ${versions[0].bucket_id} `])
82
+ if (delError) {
83
+ program.error(`Something went wrong when trying to delete ${appid} @${version} ${delError} `)
84
+ }
85
+
86
+ const { error: delAppSpecVersionError } = await supabase
87
+ .from<definitions['app_versions']>('app_versions')
88
+ .update({
89
+ deleted: true,
90
+ })
91
+ .eq('app_id', appid)
92
+ .eq('name', version)
93
+ .eq('user_id', userId)
94
+ if (delAppSpecVersionError) {
95
+ program.error(`App ${appid} @${version} not found in database ${delAppSpecVersionError} `)
96
+ }
97
+ console.log("App version deleted from server")
98
+ return
99
+ }
100
+
101
+ const { data, error: vError } = await supabase
102
+ .from<definitions['app_versions']>('app_versions')
103
+ .select()
104
+ .eq('app_id', appid)
105
+ .eq('user_id', userId)
106
+
107
+ if (vError) {
108
+ program.error(`App ${appid} not found in database ${vError} `)
109
+ }
110
+
111
+ if (data && data.length) {
112
+ const filesToRemove = data.map(x => `${userId} /${appid}/versions / ${x.bucket_id} `)
113
+ const { error: delError } = await supabase
114
+ .storage
115
+ .from('apps')
116
+ .remove(filesToRemove)
117
+ if (delError) {
118
+ program.error(`Cannot delete stored version for app ${appid} from storage ${delError} `)
40
119
  }
41
120
  }
42
- if (!res || res.status !== 200) {
43
- program.error(`Server Error \n${prettyjson.render(res.data)}`);
121
+
122
+ const { error: delAppVersionError } = await supabase
123
+ .from<definitions['app_versions']>('app_versions')
124
+ .delete()
125
+ .eq('app_id', appid)
126
+ .eq('user_id', userId)
127
+
128
+ if (delAppVersionError) {
129
+ program.error(`Cannot delete version for app ${appid} from database ${delAppVersionError} `)
44
130
  }
45
- console.log("App deleted to server")
131
+
132
+ const { error: dbAppError } = await supabase
133
+ .from<definitions['apps']>('apps')
134
+ .delete()
135
+ .eq('app_id', appid)
136
+ .eq('user_id', userId)
137
+
138
+ if (dbAppError) {
139
+ program.error(`Cannot delete from database ${dbAppError} `)
140
+ }
141
+
142
+ console.log("App deleted from server")
46
143
  }
package/src/bin/index.ts CHANGED
@@ -4,6 +4,7 @@ import { deleteApp } from './delete';
4
4
  import { setChannel } from './set';
5
5
  import { uploadVersion } from './upload';
6
6
  import pack from '../../package.json'
7
+ import { login } from './login';
7
8
 
8
9
  program
9
10
  .version(pack.version)
@@ -13,6 +14,13 @@ program
13
14
  .option('-i, --icon <icon>', 'app icon path')
14
15
  .option('-a, --apikey <apikey>', 'apikey to link to your account');
15
16
 
17
+ program
18
+ .version(pack.version)
19
+ .command('login [apikey]').alias('l')
20
+ .action(login)
21
+ .option('--local', 'Only save in local folder');
22
+
23
+
16
24
  program
17
25
  .command('upload [appid]').alias('u')
18
26
  .action(uploadVersion)
@@ -32,7 +40,7 @@ program
32
40
 
33
41
  program
34
42
  .description('Manage package and version in capgo Cloud')
35
- .command('delete [appid]').alias('a')
43
+ .command('delete [appid]').alias('d')
36
44
  .action(deleteApp)
37
45
  .option('-a, --apikey <apikey>', 'apikey to link to your account')
38
46
  .option('-v, --version <version>', 'version number of the app to delete');
@@ -0,0 +1,23 @@
1
+ import { program } from 'commander';
2
+ import fs from 'fs'
3
+ import os from 'os'
4
+
5
+ interface Options {
6
+ local: boolean;
7
+ }
8
+ export const login = async (apikey: string, options: Options) => {
9
+ // write in file .capgo the apikey in home directory
10
+ const { local } = options;
11
+
12
+ if (local) {
13
+ if (!fs.existsSync('.git')) {
14
+ program.error('To use local you should be in a git repository');
15
+ }
16
+ fs.writeFileSync('.capgo', `${apikey}\n`);
17
+ fs.appendFileSync('.gitignore', '.capgo\n');
18
+ } else {
19
+ const userHomeDir = os.homedir();
20
+ fs.writeFileSync(`${userHomeDir}/.capgo`, `${apikey}\n`);
21
+ }
22
+ console.log(`login saved into .capgo file in ${local ? 'local' : 'home'} directory`);
23
+ }
package/src/bin/set.ts CHANGED
@@ -1,7 +1,6 @@
1
- import axios from 'axios';
2
- import prettyjson from 'prettyjson';
3
1
  import { program } from 'commander';
4
- import { getConfig, host, hostSupa, supaAnon } from './utils';
2
+ import { getConfig, createSupabaseClient, updateOrCreateChannel, host, formatError, findSavedKey } from './utils';
3
+ import { definitions } from './types_supabase';
5
4
 
6
5
  interface Options {
7
6
  apikey: string;
@@ -12,9 +11,9 @@ interface Options {
12
11
 
13
12
  export const setChannel = async (appid: string, options: Options) => {
14
13
  let { version } = options;
15
- const { apikey, state, channel = 'dev' } = options;
14
+ const { state, channel = 'dev' } = options;
15
+ const apikey = options.apikey || findSavedKey()
16
16
  const config = await getConfig();
17
- let res;
18
17
  appid = appid || config?.app?.appId
19
18
  version = version || config?.app?.package?.version
20
19
  let parsedState
@@ -35,30 +34,50 @@ export const setChannel = async (appid: string, options: Options) => {
35
34
  console.log(`Set${channel} to @${state} in ${appid}`);
36
35
  }
37
36
  try {
38
- res = await axios({
39
- method: 'POST',
40
- url: `${hostSupa}/channel`,
41
- data: {
42
- version,
43
- public: parsedState,
44
- appid,
45
- channel,
46
- },
47
- validateStatus: () => true,
48
- headers: {
49
- 'apikey': apikey,
50
- 'authorization': `Bearer ${supaAnon}`
51
- }
52
- })
53
- } catch (err) {
54
- if (axios.isAxiosError(err) && err.response) {
55
- program.error(`Network Error \n${prettyjson.render(err.response?.data)}`);
56
- } else {
57
- program.error(`Unknow error \n${prettyjson.render(err)}`);
37
+ const supabase = createSupabaseClient(apikey)
38
+ const { data: apiAccess, error: apiAccessError } = await supabase
39
+ .rpc('is_allowed_capgkey', { apikey, keymode: ['write', 'all'], app_id: appid })
40
+
41
+ if (!apiAccess || apiAccessError) {
42
+ program.error("Invalid API key or insufisant rights");
58
43
  }
59
- }
60
- if (!res || res.status !== 200) {
61
- program.error(`Server Error \n${prettyjson.render(res.data)}`);
44
+ const { data: dataUser, error: userIdError } = await supabase
45
+ .rpc<string>('get_user_id', { apikey })
46
+
47
+ const userId = dataUser ? dataUser.toString() : '';
48
+
49
+ if (!userId || userIdError) {
50
+ program.error('Cannot verify user')
51
+ }
52
+ const channelPayload: Partial<definitions['channels']> = {
53
+ created_by: userId,
54
+ app_id: appid,
55
+ name: channel,
56
+ }
57
+ if (version) {
58
+ const { data, error: vError } = await supabase
59
+ .from<definitions['app_versions']>('app_versions')
60
+ .select()
61
+ .eq('app_id', appid)
62
+ .eq('name', version)
63
+ .eq('user_id', userId)
64
+ .eq('deleted', false)
65
+ if (vError || !data || !data.length)
66
+ program.error(`Cannot find version ${version}`);
67
+ channelPayload.version = data[0].id
68
+ }
69
+ if (parsedState !== undefined)
70
+ channelPayload.public = parsedState
71
+ try {
72
+ const { error: dbError } = await updateOrCreateChannel(supabase, channelPayload, apikey)
73
+ if (dbError)
74
+ program.error(`Cannot set channel ${formatError(dbError)}`);
75
+ }
76
+ catch (e) {
77
+ program.error(`Cannot set channel ${formatError(e)}`);
78
+ }
79
+ } catch (err) {
80
+ program.error(`Unknow error ${formatError(err)}`);
62
81
  }
63
82
  if (version) {
64
83
  console.log(`Done ✅`);