@capawesome/cli 0.0.12 → 0.0.14

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.
 
+## [0.0.14](https://github.com/capawesome-team/cli/compare/v0.0.13...v0.0.14) (2024-09-30)
+
+
+### Bug Fixes
+
+* **apps:** typo ([c65ca99](https://github.com/capawesome-team/cli/commit/c65ca99289b333ddb79d3ade0db33cb4571e860d))
+* **whoami:** support oauth provider ([7b80a7b](https://github.com/capawesome-team/cli/commit/7b80a7b3c5aa3d8dea6c77cf30a8bfae10961e36))
+
+## [0.0.13](https://github.com/capawesome-team/cli/compare/v0.0.12...v0.0.13) (2024-08-20)
+
+
+### Features
+
+* print notice if new version is available ([#7](https://github.com/capawesome-team/cli/issues/7)) ([db88dc3](https://github.com/capawesome-team/cli/commit/db88dc356f6f6f5f73444e341ab749ae68cfdf6a)), closes [#2](https://github.com/capawesome-team/cli/issues/2)
+
 ## [0.0.12](https://github.com/capawesome-team/cli/compare/v0.0.11...v0.0.12) (2024-07-25)
 
 

package/dist/commands/apps/bundles/create.js

@@ -93,7 +93,7 @@ exports.default = (0, citty_1.defineCommand)({
         }
         if (!appId) {
             const apps = yield apps_1.default.findAll();
-            if (!apps.length) {
+            if (apps.length === 0) {
                 consola_1.default.error('You must create an app before creating a bundle.');
                 return;
             }

package/dist/commands/apps/channels/delete.js

@@ -14,10 +14,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const citty_1 = require("citty");
 const consola_1 = __importDefault(require("consola"));
-const apps_1 = __importDefault(require("../../../services/apps"));
-const prompt_1 = require("../../../utils/prompt");
 const app_channels_1 = __importDefault(require("../../../services/app-channels"));
+const apps_1 = __importDefault(require("../../../services/apps"));
 const error_1 = require("../../../utils/error");
+const prompt_1 = require("../../../utils/prompt");
 exports.default = (0, citty_1.defineCommand)({
     meta: {
         description: 'Delete an app channel.',
@@ -37,7 +37,7 @@ exports.default = (0, citty_1.defineCommand)({
         if (!appId) {
             const apps = yield apps_1.default.findAll();
             if (!apps.length) {
-                consola_1.default.error('You must create an app before deleting a bundle.');
+                consola_1.default.error('You must create an app before deleting a channel.');
                 return;
             }
             // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged

package/dist/commands/login.js

@@ -12,13 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const axios_1 = __importDefault(require("axios"));
 const citty_1 = require("citty");
 const consola_1 = __importDefault(require("consola"));
-const axios_1 = __importDefault(require("axios"));
-const userConfig_1 = __importDefault(require("../utils/userConfig"));
 const config_1 = require("../config");
-const prompt_1 = require("../utils/prompt");
 const users_1 = __importDefault(require("../services/users"));
+const prompt_1 = require("../utils/prompt");
+const userConfig_1 = __importDefault(require("../utils/userConfig"));
 exports.default = (0, citty_1.defineCommand)({
     meta: {
         name: 'login',
@@ -32,21 +32,8 @@ exports.default = (0, citty_1.defineCommand)({
     },
     run: (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         let token = ctx.args.token;
-        if (token) {
-            userConfig_1.default.write({
-                token: token,
-            });
-            try {
-                yield users_1.default.me();
-            }
-            catch (error) {
-                userConfig_1.default.write({});
-                consola_1.default.error('Invalid token.');
-                return;
-            }
-            consola_1.default.success(`Successfully signed in.`);
-        }
-        else {
+        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:');
             consola_1.default.start('Logging in...');
@@ -68,5 +55,21 @@ exports.default = (0, citty_1.defineCommand)({
             });
             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.');
+        }
+        else {
+            userConfig_1.default.write({
+                token: token,
+            });
+            try {
+                yield users_1.default.me();
+                consola_1.default.success(`Successfully signed in.`);
+            }
+            catch (error) {
+                userConfig_1.default.write({});
+                consola_1.default.error('Invalid token. Please provide a valid token. You can create a token at https://cloud.capawesome.io/settings/tokens.');
+            }
+        }
     }),
 });

package/dist/commands/whoami.js

@@ -14,19 +14,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const citty_1 = require("citty");
 const consola_1 = __importDefault(require("consola"));
-const userConfig_1 = __importDefault(require("../utils/userConfig"));
 const users_1 = __importDefault(require("../services/users"));
+const userConfig_1 = __importDefault(require("../utils/userConfig"));
 exports.default = (0, citty_1.defineCommand)({
     meta: {
         name: 'whoami',
         description: 'Show current user',
     },
     run: () => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b;
         const { token } = userConfig_1.default.read();
         if (token) {
             try {
                 const user = yield users_1.default.me();
-                consola_1.default.info(`Logged in as ${user.email}.`);
+                const email = user.email;
+                const userProviderProfile = user.userProviderProfiles[0]
+                    ? ((_a = user.userProviderProfiles[0]) === null || _a === void 0 ? void 0 : _a.provider) + ':' + ((_b = user.userProviderProfiles[0]) === null || _b === void 0 ? void 0 : _b.providerUsername)
+                    : null;
+                consola_1.default.info(`Logged in as ${email || userProviderProfile || '?'}.`);
             }
             catch (error) {
                 consola_1.default.error('Token is invalid. Please sign in again.');

package/dist/index.js

@@ -29,12 +29,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const citty_1 = require("citty");
 const package_json_1 = __importDefault(require("../package.json"));
+const update_1 = __importDefault(require("./services/update"));
 const main = (0, citty_1.defineCommand)({
     meta: {
         name: package_json_1.default.name,
         version: package_json_1.default.version,
         description: package_json_1.default.description,
     },
+    setup() {
+        // No op
+    },
+    cleanup() {
+        return update_1.default.checkForUpdate();
+    },
     subCommands: {
         whoami: Promise.resolve().then(() => __importStar(require('./commands/whoami'))).then((mod) => mod.default),
         login: Promise.resolve().then(() => __importStar(require('./commands/login'))).then((mod) => mod.default),

package/dist/services/update.js

@@ -0,0 +1,60 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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 consola_1 = __importDefault(require("consola"));
+const semver = __importStar(require("semver"));
+const package_json_1 = __importDefault(require("../../package.json"));
+const http_client_1 = __importDefault(require("../utils/http-client"));
+class UpdateServiceImpl {
+    constructor(httpClient) {
+        this.httpClient = httpClient;
+    }
+    checkForUpdate() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.httpClient.get(`https://registry.npmjs.org/${package_json_1.default.name}/latest`);
+            if (!response.success) {
+                throw response.error;
+            }
+            const latestVersion = response.data.version;
+            if (semver.gt(latestVersion, package_json_1.default.version)) {
+                consola_1.default.warn(`New version of Capawesome CLI available: ${package_json_1.default.name}@${latestVersion}. Please update to receive the latest features and bug fixes.`);
+            }
+        });
+    }
+}
+const updateService = new UpdateServiceImpl(http_client_1.default);
+exports.default = updateService;

package/dist/types/npm-package.js

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

package/dist/utils/http-client.js

@@ -18,7 +18,8 @@ class HttpClientImpl {
     delete(url, config) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const res = yield axios_1.default.delete(config_1.API_URL + url, config);
+                const urlWithHost = url.startsWith('http') ? url : config_1.API_URL + url;
+                const res = yield axios_1.default.delete(urlWithHost, config);
                 return {
                     success: true,
                     status: res.status,
@@ -37,7 +38,8 @@ class HttpClientImpl {
     get(url, config) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const res = yield axios_1.default.get(config_1.API_URL + url, config);
+                const urlWithHost = url.startsWith('http') ? url : config_1.API_URL + url;
+                const res = yield axios_1.default.get(urlWithHost, config);
                 return {
                     success: true,
                     status: res.status,
@@ -56,7 +58,8 @@ class HttpClientImpl {
     patch(url, data, config) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const res = yield axios_1.default.patch(config_1.API_URL + url, data, config);
+                const urlWithHost = url.startsWith('http') ? url : config_1.API_URL + url;
+                const res = yield axios_1.default.patch(urlWithHost, data, config);
                 return {
                     success: true,
                     status: res.status,
@@ -75,7 +78,8 @@ class HttpClientImpl {
     post(url, data, config) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const res = yield axios_1.default.post(config_1.API_URL + url, data, config);
+                const urlWithHost = url.startsWith('http') ? url : config_1.API_URL + url;
+                const res = yield axios_1.default.post(urlWithHost, data, config);
                 return {
                     success: true,
                     status: res.status,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capawesome/cli",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "The Capawesome Cloud Command Line Interface (CLI) to manage Live Updates and more.",
   "scripts": {
     "build": "rimraf ./dist && tsc",
@@ -46,12 +46,14 @@
     "citty": "0.1.6",
     "consola": "3.2.3",
     "form-data": "4.0.0",
-    "rc9": "2.1.1"
+    "rc9": "2.1.1",
+    "semver": "7.6.3"
   },
   "devDependencies": {
     "@ionic/prettier-config": "4.0.0",
     "@types/archiver": "6.0.2",
     "@types/node": "20.11.30",
+    "@types/semver": "7.5.8",
     "commit-and-tag-version": "12.4.0",
     "prettier": "3.2.5",
     "rimraf": "5.0.5",