@capgo/cli 3.14.65 → 3.14.67

package/package.json

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

package/src/api/app.ts

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

package/src/api/channels.ts

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

package/src/api/crypto.ts

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

package/src/api/devices_override.ts

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

package/src/api/versions.ts

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

package/src/app/add.ts

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

package/src/app/debug.ts

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

package/src/app/info.ts

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

package/src/app/list.ts

@@ -2,7 +2,7 @@ import { program } from 'commander';
 import { Table } from 'console-table-printer';
 import { SupabaseClient } from '@supabase/supabase-js';
 import * as p from '@clack/prompts';
-import { Database } from 'types/supabase.types';
+import { Database } from '../types/supabase.types';
 import { OptionsBase, createSupabaseClient, findSavedKey, getHumanDate, verifyUser } from '../utils';
 import { checkLatest } from '../api/update';
 

package/src/app/set.ts

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

package/src/bundle/check.ts

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

package/src/bundle/cleanup.ts

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

package/src/bundle/decrypt.ts

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

package/src/bundle/unlink.ts

@@ -1,6 +1,6 @@
 import { program } from 'commander';
 import * as p from '@clack/prompts';
-import { getVersionData } from 'api/versions';
+import { getVersionData } from '../api/versions';
 import { checkVersionNotUsedInDeviceOverride } from '../api/devices_override';
 import { checkVersionNotUsedInChannel } from '../api/channels';
 import { checkAppExistsAndHasPermissionErr } from "../api/app";

package/src/bundle/upload.ts

@@ -1,11 +1,11 @@
-import { randomUUID } from 'crypto';
-import { existsSync, readFileSync } from 'fs';
+import { randomUUID } from 'node:crypto';
+import { existsSync, readFileSync } from 'node:fs';
 import AdmZip from 'adm-zip';
 import { program } from 'commander';
 import * as p from '@clack/prompts';
 import { checksum as getChecksum } from '@tomasklaen/checksum';
 import ciDetect from 'ci-info';
-import axios from "axios";
+import ky from 'ky';
 import { checkLatest } from '../api/update';
 import { checkAppExistsAndHasPermissionOrgErr } from "../api/app";
 import { encryptSource } from '../api/crypto';
@@ -320,11 +320,8 @@ It will be also visible in your dashboard\n`);
       p.log.error(`Cannot get upload url`);
       program.error('');
     }
-
-    await axios({
-      method: "put",
-      url,
-      data: zipped,
+    await ky.put(url, {
+      body: zipped,
       headers: (!localS3 ? {
         "Content-Type": "application/octet-stream",
         "Cache-Control": "public, max-age=456789, immutable",

package/src/bundle/zip.ts

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

package/src/channel/set.ts

@@ -1,6 +1,6 @@
 import { program } from 'commander';
 import * as p from '@clack/prompts';
-import { Database } from 'types/supabase.types';
+import { Database } from '../types/supabase.types';
 import { checkAppExistsAndHasPermissionErr } from "../api/app";
 import {
   OptionsBase,

package/src/index.ts

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

package/src/init.ts

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

package/src/key.ts

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

package/src/login.ts

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

package/src/utils.ts

@@ -1,15 +1,15 @@
-import { existsSync, readdirSync, readFileSync } from 'fs';
-import { homedir } from 'os';
-import { resolve } from 'path';
+import { existsSync, readdirSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { resolve } from 'node:path';
 import { loadConfig } from '@capacitor/cli/dist/config';
 import { program } from 'commander';
 import { createClient, SupabaseClient } from '@supabase/supabase-js';
 import prettyjson from 'prettyjson';
 import { LogSnag } from 'logsnag';
 import * as p from '@clack/prompts';
-import { Database } from 'types/supabase.types';
-import axios from 'axios';
+import ky from 'ky';
 import { promiseFiles } from 'node-dir'
+import { Database } from './types/supabase.types';
 
 export const baseKey = '.capgo_key';
 export const baseKeyPub = `${baseKey}.pub`;
@@ -68,9 +68,9 @@ interface CapgoConfig {
 export const getRemoteConfig = async () => {
     // call host + /api/get_config and parse the result as json using axios
     const localConfig = await getLocalConfig()
-    return axios
+    return ky
         .get(`${defaultApiHost}/get_config`)
-        .then((res) => res.data as CapgoConfig)
+        .then((res) => res.json<CapgoConfig>())
         .then(data => ({ ...data, ...localConfig } as CapgoConfig))
         .catch(() => {
             console.log('Local config', localConfig);
@@ -404,7 +404,9 @@ export async function uploadUrl(supabase: SupabaseClient<Database>, appId: strin
         bucket_id: bucketId,
     }
     try {
-        const res = await supabase.functions.invoke('upload_link', { body: JSON.stringify(data) })
+        const pathUploadLink = 'private/upload_link'
+        // const pathUploadLink = 'private/upload_link' // TODO: switch to new endpoint when new backend released
+        const res = await supabase.functions.invoke(pathUploadLink, { body: JSON.stringify(data) })
         return res.data.url
     } catch (error) {
         p.log.error(`Cannot get upload url ${JSON.stringify(error)}`);

package/tsconfig.json

@@ -11,17 +11,29 @@
     "sourceMap": true,
     "outDir": "dist",
     "baseUrl": "src",
-    "lib": ["es2016", "dom"],
+    "lib": [
+      "es2016",
+      "dom"
+    ],
     "typeRoots": [
       "src/types/*"
     ],
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist", "__tests__", "**/*.spec.ts"],
-  "paths": {
+    "paths": {
       "*": [
-          "src/types/*"
+        "src/types/*"
       ],
-      "@capacitor/cli/dist/config": ["src/types/capacitor-cli.d.ts"]
-  }
+      "@capacitor/cli/dist/config": [
+        "src/types/capacitor-cli.d.ts"
+      ]
+    }
+  },
+  "include": [
+    "src/**/*"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist",
+    "__tests__",
+    "**/*.spec.ts"
+  ],
 }

package/webpack.config.js

@@ -1,34 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-const nodeExternals = require('webpack-node-externals');
-console.log(process.env.NODE_ENV || 'production');
-module.exports = {
-  mode: process.env.NODE_ENV || 'production',
-  target: 'node',
-  externals: [nodeExternals()],
-  entry: './src/index.ts',
-  module: {
-    rules: [
-      {
-        test: /\.ts$/,
-        loader: 'ts-loader',
-        exclude: /node_modules/,
-      },
-    ],
-  },
-  devtool: process.env.NODE_ENV === 'development' ? 'eval-source-map' : undefined,
-  watch: process.env.NODE_ENV === 'development',
-  plugins: [
-    new webpack.BannerPlugin({ banner: '#!/usr/bin/env node', raw: true }),
-    new webpack.EnvironmentPlugin({
-      SUPA_DB: 'production',
-      }),
-  ],
-  resolve: {
-    extensions: ['.ts', '.js'],
-  },
-  output: {
-    filename: 'index.js',
-    path: path.resolve(__dirname, 'dist'),
-  },
-};