@capawesome/cli 1.6.3 → 1.8.0

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.8.0](https://github.com/capawesome-team/cli/compare/v1.7.0...v1.8.0) (2025-04-06)
+
+
+### Features
+
+* login via browser ([#39](https://github.com/capawesome-team/cli/issues/39)) ([814f0e4](https://github.com/capawesome-team/cli/commit/814f0e4875e6ce0a21fd655cfa3c57b50fa5146a)), closes [#32](https://github.com/capawesome-team/cli/issues/32)
+
+
+### Bug Fixes
+
+* improved error handling ([9f12894](https://github.com/capawesome-team/cli/commit/9f128941d1a8576034712cadea22da62313fa90c))
+
+## [1.7.0](https://github.com/capawesome-team/cli/compare/v1.6.3...v1.7.0) (2025-03-24)
+
+
+### Features
+
+* **doctor:** add doctor command ([#37](https://github.com/capawesome-team/cli/issues/37)) ([1d9d0ac](https://github.com/capawesome-team/cli/commit/1d9d0acf74b1b3ce63c87031a8499227bf3e3f8b))
+
 ## [1.6.3](https://github.com/capawesome-team/cli/compare/v1.6.2...v1.6.3) (2025-03-20)
 
 

package/dist/commands/doctor.js

@@ -0,0 +1,34 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const citty_1 = require("citty");
+const consola_1 = __importDefault(require("consola"));
+const package_json_1 = __importDefault(require("../../package.json"));
+const systeminformation_1 = __importDefault(require("systeminformation"));
+exports.default = (0, citty_1.defineCommand)({
+    meta: {
+        name: 'doctor',
+        description: 'Prints out neccessary information for debugging',
+    },
+    run: () => __awaiter(void 0, void 0, void 0, function* () {
+        const osInfo = yield systeminformation_1.default.osInfo();
+        const versions = yield systeminformation_1.default.versions('npm, node');
+        consola_1.default.box([
+            `NodeJS version: ${versions.node}`,
+            `NPM version: ${versions.npm}`,
+            `CLI version: ${package_json_1.default.version}`,
+            `OS: ${osInfo.distro} ${osInfo.release} ${osInfo.codename ? `(${osInfo.codename})` : ''}`,
+        ].join('\n'));
+    }),
+});

package/dist/commands/login.js

@@ -15,6 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = require("axios");
 const citty_1 = require("citty");
 const consola_1 = __importDefault(require("consola"));
+const open_1 = __importDefault(require("open"));
+const config_1 = __importDefault(require("../services/config"));
+const session_code_1 = __importDefault(require("../services/session-code"));
 const sessions_1 = __importDefault(require("../services/sessions"));
 const users_1 = __importDefault(require("../services/users"));
 const error_1 = require("../utils/error");
@@ -33,55 +36,107 @@ exports.default = (0, citty_1.defineCommand)({
     },
     run: (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
-        let token = ctx.args.token;
-        if (token === undefined) {
-            consola_1.default.warn('If you have signed up via an OAuth provider, please sign in using the `--token` argument.');
-            const email = (yield (0, prompt_1.prompt)('Enter your email:', { type: 'text' }));
-            const password = (yield (0, prompt_1.passwordPrompt)('Enter your password:'));
-            if (!email || !password) {
-                consola_1.default.error('Invalid email or password.');
-                process.exit(1);
-            }
-            consola_1.default.start('Logging in...');
-            let sessionId;
-            try {
-                const response = yield sessions_1.default.create({
-                    email,
-                    password,
+        const consoleBaseUrl = yield config_1.default.getValueForKey('CONSOLE_BASE_URL');
+        let sessionIdOrToken = ctx.args.token;
+        if (sessionIdOrToken === undefined) {
+            // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
+            const authenticationMethod = yield (0, prompt_1.prompt)('How would you like to authenticate Capawesome CLI?', {
+                type: 'select',
+                options: [
+                    { label: 'Login with a web browser', value: 'browser' },
+                    { label: 'Paste an authentication token', value: 'token' },
+                ],
+            });
+            if (authenticationMethod === 'browser') {
+                // Create a session code
+                const { id: deviceCode, code: userCode } = yield session_code_1.default.create();
+                consola_1.default.box(`Copy your one-time code: ${userCode.slice(0, 4)}-${userCode.slice(4)}`);
+                // Prompt the user to open the authorization URL in their browser
+                const shouldProceed = yield (0, prompt_1.prompt)(`Select Yes to continue in your browser or No to cancel the authentication.`, {
+                    type: 'confirm',
+                    initial: true,
                 });
-                sessionId = response.id;
+                if (!shouldProceed) {
+                    consola_1.default.error('Authentication cancelled.');
+                    process.exit(1);
+                }
+                // Open the authorization URL in the user's default browser
+                consola_1.default.start('Opening browser...');
+                const authorizationUrl = `${consoleBaseUrl}/login/device`;
+                try {
+                    (0, open_1.default)(authorizationUrl);
+                }
+                catch (error) {
+                    consola_1.default.warn(`Could not open browser automatically. Please open the following URL manually: ${authorizationUrl}`);
+                }
+                // Wait for the user to authenticate
+                consola_1.default.start('Waiting for authentication...');
+                const sessionId = yield createSession(deviceCode);
+                if (!sessionId) {
+                    consola_1.default.error('Authentication timed out. Please try again.');
+                    process.exit(1);
+                }
+                sessionIdOrToken = sessionId;
             }
-            catch (error) {
-                consola_1.default.error('Invalid email or password.');
-                process.exit(1);
+            else {
+                sessionIdOrToken = yield (0, prompt_1.prompt)('Please provide your authentication token:', {
+                    type: 'text',
+                });
+                if (!sessionIdOrToken) {
+                    consola_1.default.error('Token must be provided.');
+                    process.exit(1);
+                }
             }
-            userConfig_1.default.write({
-                token: sessionId,
-            });
+        }
+        else if (sessionIdOrToken.length === 0) {
+            // No token provided
+            consola_1.default.error(`Please provide a valid token. You can create a token at ${consoleBaseUrl}/settings/tokens.`);
+            process.exit(1);
+        }
+        // Sign in with the provided token
+        consola_1.default.start('Signing in...');
+        userConfig_1.default.write({
+            token: sessionIdOrToken,
+        });
+        try {
+            yield users_1.default.me();
             consola_1.default.success(`Successfully signed in.`);
         }
-        else if (token.length === 0) {
-            consola_1.default.error('Please provide a valid token. You can create a token at https://cloud.capawesome.io/settings/tokens.');
+        catch (error) {
+            userConfig_1.default.write({});
+            let message = (0, error_1.getMessageFromUnknownError)(error);
+            if (error instanceof axios_1.AxiosError && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401) {
+                message = `Invalid token. Please provide a valid token. You can create a token at ${consoleBaseUrl}/settings/tokens.`;
+            }
+            consola_1.default.error(message);
             process.exit(1);
         }
-        else {
-            userConfig_1.default.write({
-                token: token,
+    }),
+});
+const createSession = (deviceCode) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const maxAttempts = 20;
+    const interval = 3 * 1000; // 3 seconds
+    let attempts = 0;
+    let sessionId = null;
+    while (attempts < maxAttempts && sessionId === null) {
+        try {
+            const response = yield sessions_1.default.create({
+                code: deviceCode,
+                provider: 'code',
             });
-            try {
-                yield users_1.default.me();
-                consola_1.default.success(`Successfully signed in.`);
+            sessionId = response.id;
+        }
+        catch (error) {
+            if (error instanceof axios_1.AxiosError && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 400) {
+                // Session not ready yet, wait and try again
+                attempts++;
+                yield new Promise((resolve) => setTimeout(resolve, interval));
             }
-            catch (error) {
-                userConfig_1.default.write({});
-                let message = (0, error_1.getMessageFromUnknownError)(error);
-                if (error instanceof axios_1.AxiosError && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401) {
-                    message =
-                        'Invalid token. Please provide a valid token. You can create a token at https://cloud.capawesome.io/settings/tokens.';
-                }
-                consola_1.default.error(message);
-                process.exit(1);
+            else {
+                throw error;
             }
         }
-    }),
+    }
+    return sessionId;
 });

package/dist/index.js

@@ -38,9 +38,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Sentry = __importStar(require("@sentry/node"));
 const citty_1 = require("citty");
+const consola_1 = __importDefault(require("consola"));
 const package_json_1 = __importDefault(require("../package.json"));
 const config_1 = __importDefault(require("./services/config"));
 const update_1 = __importDefault(require("./services/update"));
+const error_1 = require("./utils/error");
 const main = (0, citty_1.defineCommand)({
     meta: {
         name: package_json_1.default.name,
@@ -57,6 +59,7 @@ const main = (0, citty_1.defineCommand)({
         whoami: Promise.resolve().then(() => __importStar(require('./commands/whoami'))).then((mod) => mod.default),
         login: Promise.resolve().then(() => __importStar(require('./commands/login'))).then((mod) => mod.default),
         logout: Promise.resolve().then(() => __importStar(require('./commands/logout'))).then((mod) => mod.default),
+        doctor: Promise.resolve().then(() => __importStar(require('./commands/doctor'))).then((mod) => mod.default),
         'apps:create': Promise.resolve().then(() => __importStar(require('./commands/apps/create'))).then((mod) => mod.default),
         'apps:delete': Promise.resolve().then(() => __importStar(require('./commands/apps/delete'))).then((mod) => mod.default),
         'apps:bundles:create': Promise.resolve().then(() => __importStar(require('./commands/apps/bundles/create'))).then((mod) => mod.default),
@@ -80,9 +83,16 @@ const captureException = (error) => __awaiter(void 0, void 0, void 0, function*
     yield Sentry.close();
 });
 (0, citty_1.runMain)(main).catch((error) => __awaiter(void 0, void 0, void 0, function* () {
-    yield captureException(error).catch(() => {
-        // No op
-    });
-    console.error(error);
-    process.exit(1);
+    try {
+        yield captureException(error).catch(() => {
+            // No op
+        });
+        // Print the error message
+        const message = (0, error_1.getMessageFromUnknownError)(error);
+        consola_1.default.error(message);
+    }
+    finally {
+        // Exit with a non-zero code
+        process.exit(1);
+    }
 }));

package/dist/services/app-bundle-files.js

@@ -30,7 +30,7 @@ class AppBundleFilesServiceImpl {
             if (dto.signature) {
                 formData.append('signature', dto.signature);
             }
-            const response = yield this.httpClient.post(`/apps/${dto.appId}/bundles/${dto.appBundleId}/files`, formData, {
+            const response = yield this.httpClient.post(`/v1/apps/${dto.appId}/bundles/${dto.appBundleId}/files`, formData, {
                 headers: Object.assign({ Authorization: `Bearer ${authorization_service_1.default.getCurrentAuthorizationToken()}` }, formData.getHeaders()),
             });
             return response.data;

package/dist/services/app-bundles.js

@@ -20,7 +20,7 @@ class AppBundlesServiceImpl {
     }
     create(dto) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.httpClient.post(`/apps/${dto.appId}/bundles`, dto, {
+            const response = yield this.httpClient.post(`/v1/apps/${dto.appId}/bundles`, dto, {
                 headers: {
                     Authorization: `Bearer ${authorization_service_1.default.getCurrentAuthorizationToken()}`,
                 },
@@ -30,7 +30,7 @@ class AppBundlesServiceImpl {
     }
     update(dto) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.httpClient.patch(`/apps/${dto.appId}/bundles/${dto.appBundleId}`, dto, {
+            const response = yield this.httpClient.patch(`/v1/apps/${dto.appId}/bundles/${dto.appBundleId}`, dto, {
                 headers: {
                     Authorization: `Bearer ${authorization_service_1.default.getCurrentAuthorizationToken()}`,
                 },
@@ -40,7 +40,7 @@ class AppBundlesServiceImpl {
     }
     delete(dto) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.httpClient.delete(`/apps/${dto.appId}/bundles/${dto.appBundleId}`, {
+            yield this.httpClient.delete(`/v1/apps/${dto.appId}/bundles/${dto.appBundleId}`, {
                 headers: {
                     Authorization: `Bearer ${authorization_service_1.default.getCurrentAuthorizationToken()}`,
                 },

package/dist/services/app-channels.js

@@ -20,7 +20,7 @@ class AppChannelsServiceImpl {
     }
     create(dto) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.httpClient.post(`/apps/${dto.appId}/channels`, dto, {
+            const response = yield this.httpClient.post(`/v1/apps/${dto.appId}/channels`, dto, {
                 headers: {
                     Authorization: `Bearer ${authorization_service_1.default.getCurrentAuthorizationToken()}`,
                 },
@@ -30,7 +30,7 @@ class AppChannelsServiceImpl {
     }
     delete(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.httpClient.delete(`/apps/${data.appId}/channels`, {
+            yield this.httpClient.delete(`/v1/apps/${data.appId}/channels`, {
                 headers: {
                     Authorization: `Bearer ${authorization_service_1.default.getCurrentAuthorizationToken()}`,
                 },

package/dist/services/app-devices.js

@@ -20,7 +20,7 @@ class AppDevicesServiceImpl {
     }
     delete(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.httpClient.delete(`/apps/${data.appId}/devices/${data.deviceId}`, {
+            yield this.httpClient.delete(`/v1/apps/${data.appId}/devices/${data.deviceId}`, {
                 headers: {
                     Authorization: `Bearer ${authorization_service_1.default.getCurrentAuthorizationToken()}`,
                 },

package/dist/services/apps.js

@@ -20,7 +20,7 @@ class AppsServiceImpl {
     }
     create(dto) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.httpClient.post(`/apps`, dto, {
+            const response = yield this.httpClient.post(`/v1/apps`, dto, {
                 headers: {
                     Authorization: `Bearer ${authorization_service_1.default.getCurrentAuthorizationToken()}`,
                 },
@@ -30,7 +30,7 @@ class AppsServiceImpl {
     }
     delete(dto) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.httpClient.delete(`/apps/${dto.id}`, {
+            yield this.httpClient.delete(`/v1/apps/${dto.id}`, {
                 headers: {
                     Authorization: `Bearer ${authorization_service_1.default.getCurrentAuthorizationToken()}`,
                 },
@@ -39,7 +39,7 @@ class AppsServiceImpl {
     }
     findAll() {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.httpClient.get('/apps', {
+            const response = yield this.httpClient.get('/v1/apps', {
                 headers: {
                     Authorization: `Bearer ${authorization_service_1.default.getCurrentAuthorizationToken()}`,
                 },

package/dist/services/config.js

@@ -23,7 +23,8 @@ class ConfigServiceImpl {
         return __awaiter(this, void 0, void 0, function* () {
             const { config } = yield (0, c12_1.loadConfig)({
                 defaults: {
-                    API_URL: 'https://api.cloud.capawesome.io/v1',
+                    API_BASE_URL: 'https://api.cloud.capawesome.io',
+                    CONSOLE_BASE_URL: 'https://console.cloud.capawesome.io',
                     ENVIRONMENT: 'production',
                 },
                 name: 'capawesome',

package/dist/services/session-code.js

@@ -0,0 +1,28 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const http_client_1 = __importDefault(require("../utils/http-client"));
+class SessionCodesServiceImpl {
+    constructor(httpClient) {
+        this.httpClient = httpClient;
+    }
+    create() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.httpClient.post(`/v1/sessions/codes`, {});
+            return response.data;
+        });
+    }
+}
+const sessionCodesService = new SessionCodesServiceImpl(http_client_1.default);
+exports.default = sessionCodesService;

package/dist/services/sessions.js

@@ -20,13 +20,13 @@ class SessionsServiceImpl {
     }
     create(dto) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.httpClient.post(`/sessions`, dto);
+            const response = yield this.httpClient.post(`/v1/sessions`, dto);
             return response.data;
         });
     }
     delete(dto) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.httpClient.delete(`/sessions/${dto.id}`, {
+            yield this.httpClient.delete(`/v1/sessions/${dto.id}`, {
                 headers: {
                     Authorization: `Bearer ${authorization_service_1.default.getCurrentAuthorizationToken()}`,
                 },

package/dist/services/users.js

@@ -20,7 +20,7 @@ class UsersServiceImpl {
     }
     me() {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.httpClient.get('/users/me', {
+            const response = yield this.httpClient.get('/v1/users/me', {
                 headers: {
                     Authorization: `Bearer ${authorization_service_1.default.getCurrentAuthorizationToken()}`,
                 },

package/dist/types/index.js

@@ -19,4 +19,5 @@ __exportStar(require("./app-bundle"), exports);
 __exportStar(require("./app-channel"), exports);
 __exportStar(require("./app-device"), exports);
 __exportStar(require("./session"), exports);
+__exportStar(require("./session-code"), exports);
 __exportStar(require("./user"), exports);

package/dist/types/session-code.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils/http-client.js

@@ -23,35 +23,35 @@ class HttpClientImpl {
     }
     delete(url, config) {
         return __awaiter(this, void 0, void 0, function* () {
-            const baseUrl = yield config_1.default.getValueForKey('API_URL');
+            const baseUrl = yield config_1.default.getValueForKey('API_BASE_URL');
             const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
             return axios_1.default.delete(urlWithHost, Object.assign(Object.assign({}, config), { headers: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.headers), this.baseHeaders) }));
         });
     }
     get(url, config) {
         return __awaiter(this, void 0, void 0, function* () {
-            const baseUrl = yield config_1.default.getValueForKey('API_URL');
+            const baseUrl = yield config_1.default.getValueForKey('API_BASE_URL');
             const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
             return axios_1.default.get(urlWithHost, Object.assign(Object.assign({}, config), { headers: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.headers), this.baseHeaders) }));
         });
     }
     patch(url, data, config) {
         return __awaiter(this, void 0, void 0, function* () {
-            const baseUrl = yield config_1.default.getValueForKey('API_URL');
+            const baseUrl = yield config_1.default.getValueForKey('API_BASE_URL');
             const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
             return axios_1.default.patch(urlWithHost, data, Object.assign(Object.assign({}, config), { headers: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.headers), this.baseHeaders) }));
         });
     }
     post(url, data, config) {
         return __awaiter(this, void 0, void 0, function* () {
-            const baseUrl = yield config_1.default.getValueForKey('API_URL');
+            const baseUrl = yield config_1.default.getValueForKey('API_BASE_URL');
             const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
             return axios_1.default.post(urlWithHost, data, Object.assign(Object.assign({}, config), { headers: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.headers), this.baseHeaders) }));
         });
     }
     put(url, data, config) {
         return __awaiter(this, void 0, void 0, function* () {
-            const baseUrl = yield config_1.default.getValueForKey('API_URL');
+            const baseUrl = yield config_1.default.getValueForKey('API_BASE_URL');
             const urlWithHost = url.startsWith('http') ? url : baseUrl + url;
             return axios_1.default.put(urlWithHost, data, Object.assign(Object.assign({}, config), { headers: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.headers), this.baseHeaders) }));
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capawesome/cli",
-  "version": "1.6.3",
+  "version": "1.8.0",
   "description": "The Capawesome Cloud Command Line Interface (CLI) to manage Live Updates and more.",
   "scripts": {
     "build": "patch-package && rimraf ./dist && tsc",
@@ -41,15 +41,17 @@
   ],
   "dependencies": {
     "@clack/prompts": "0.7.0",
-    "@sentry/node": "8.47.0",
+    "@sentry/node": "8.55.0",
     "archiver": "7.0.1",
-    "axios": "1.7.7",
+    "axios": "1.8.4",
     "c12": "2.0.1",
     "citty": "0.1.6",
     "consola": "3.3.0",
     "form-data": "4.0.1",
+    "open": "10.1.0",
     "rc9": "2.1.2",
-    "semver": "7.6.3"
+    "semver": "7.6.3",
+    "systeminformation": "5.25.11"
   },
   "devDependencies": {
     "@ionic/prettier-config": "4.0.0",