hereya-cli 0.37.2 → 0.38.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.37.2 linux-x64 node-v22.16.0
+hereya-cli/0.38.0 linux-x64 node-v22.16.0
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -88,7 +88,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -113,7 +113,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/bootstrap/index.ts)_
 
 ## `hereya config export-backend [FILE]`
 
@@ -135,7 +135,7 @@ EXAMPLES
   $ hereya config export-backend ./path/to/export.json
 ```
 
-_See code: [src/commands/config/export-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/config/export-backend/index.ts)_
+_See code: [src/commands/config/export-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/config/export-backend/index.ts)_
 
 ## `hereya config get-backend`
 
@@ -152,7 +152,7 @@ EXAMPLES
   $ hereya config get-backend
 ```
 
-_See code: [src/commands/config/get-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/config/get-backend/index.ts)_
+_See code: [src/commands/config/get-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/config/get-backend/index.ts)_
 
 ## `hereya config import-backend FILE`
 
@@ -172,7 +172,7 @@ EXAMPLES
   $ hereya config import-backend ./path/to/cloud-backend.json
 ```
 
-_See code: [src/commands/config/import-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/config/import-backend/index.ts)_
+_See code: [src/commands/config/import-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/config/import-backend/index.ts)_
 
 ## `hereya config use-backend TYPE`
 
@@ -194,7 +194,7 @@ EXAMPLES
   $ hereya config use-backend local
 ```
 
-_See code: [src/commands/config/use-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/config/use-backend/index.ts)_
+_See code: [src/commands/config/use-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/config/use-backend/index.ts)_
 
 ## `hereya deploy`
 
@@ -219,7 +219,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -246,7 +246,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/down/index.ts)_
 
 ## `hereya env [NAME]`
 
@@ -277,7 +277,7 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/env/index.ts)_
 
 ## `hereya env set [NAME]`
 
@@ -304,7 +304,7 @@ EXAMPLES
   $ hereya env set FOO -v bar -w dev
 ```
 
-_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/env/set/index.ts)_
+_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/env/set/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -350,7 +350,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/init/index.ts)_
 
 ## `hereya login [URL]`
 
@@ -374,7 +374,7 @@ EXAMPLES
   $ hereya login http://localhost:5173
 ```
 
-_See code: [src/commands/login/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/login/index.ts)_
+_See code: [src/commands/login/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/login/index.ts)_
 
 ## `hereya logout`
 
@@ -391,7 +391,7 @@ EXAMPLES
   $ hereya logout
 ```
 
-_See code: [src/commands/logout/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/logout/index.ts)_
+_See code: [src/commands/logout/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/logout/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -418,7 +418,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -444,7 +444,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/run/index.ts)_
 
 ## `hereya unbootstrap INFRASTRUCTURETYPE`
 
@@ -469,7 +469,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/unbootstrap/index.ts)_
 
 ## `hereya undeploy`
 
@@ -494,7 +494,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -521,7 +521,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -544,7 +544,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -564,7 +564,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env [NAME]`
 
@@ -590,7 +590,7 @@ EXAMPLES
   $ hereya workspace env myEnv -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace env set`
 
@@ -614,7 +614,7 @@ EXAMPLES
   $ hereya workspace env set -w my-workspace -n myVar -v my-value -i aws -s
 ```
 
-_See code: [src/commands/workspace/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/workspace/env/set/index.ts)_
+_See code: [src/commands/workspace/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/workspace/env/set/index.ts)_
 
 ## `hereya workspace env unset`
 
@@ -635,7 +635,7 @@ EXAMPLES
   $ hereya workspace env unset -w my-workspace -n myVar
 ```
 
-_See code: [src/commands/workspace/env/unset/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/workspace/env/unset/index.ts)_
+_See code: [src/commands/workspace/env/unset/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/workspace/env/unset/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -662,7 +662,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/workspace/install/index.ts)_
 
 ## `hereya workspace list`
 
@@ -679,7 +679,7 @@ EXAMPLES
   $ hereya workspace list
 ```
 
-_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/workspace/list/index.ts)_
+_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/workspace/list/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -706,5 +706,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.37.2/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.38.0/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

package/dist/backend/cloud/login.d.ts

@@ -14,3 +14,11 @@ export declare function registerDevice(url: string): Promise<{
     error: string;
     success: false;
 }>;
+export declare function refreshToken(url: string, refreshToken: string): Promise<{
+    accessToken: string;
+    refreshToken: string;
+    success: true;
+} | {
+    error: string;
+    success: false;
+}>;

package/dist/backend/cloud/login.js

@@ -147,3 +147,23 @@ async function waitForAuthorizationCode(port) {
         });
     });
 }
+export async function refreshToken(url, refreshToken) {
+    const response = await fetch(`${url}/auth/refresh`, {
+        headers: {
+            Authorization: `Bearer ${refreshToken}`,
+        },
+        method: 'POST',
+    });
+    if (!response.ok) {
+        return {
+            error: `Failed to refresh token: ${JSON.stringify(await response.json())}`,
+            success: false,
+        };
+    }
+    const result = (await response.json());
+    return {
+        accessToken: result.data.accessToken,
+        refreshToken: result.data.refreshToken,
+        success: true,
+    };
+}

package/dist/backend/index.js

@@ -1,10 +1,24 @@
 import { getAwsConfig } from '../infrastructure/aws-config.js';
 import { CloudBackend } from './cloud/cloud-backend.js';
-import { getCloudCredentials, loadBackendConfig } from './config.js';
+import { refreshToken } from './cloud/login.js';
+import { getCloudCredentials, loadBackendConfig, saveCloudCredentials } from './config.js';
 import { LocalFileBackend } from './local.js';
 import { S3FileBackend } from './s3.js';
 let backend;
 let currentBackendType;
+function isTokenExpired(token) {
+    try {
+        const payload = JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
+        const expirationTime = payload.exp * 1000; // Convert to milliseconds
+        const currentTime = Date.now();
+        // Refresh token if it expires in less than 1 hour
+        return currentTime > expirationTime - 1 * 60 * 60 * 1000;
+    }
+    catch {
+        // If we can't decode the token, assume it's expired
+        return true;
+    }
+}
 export async function getBackend(type) {
     if (backend) {
         return backend;
@@ -20,10 +34,26 @@ export async function getBackend(type) {
             if (!credentials) {
                 throw new Error('Cloud credentials not found. Please run `hereya login` first.');
             }
+            let { accessToken, refreshToken: refreshTokenValue } = credentials;
+            // Check if token is expired and refresh if necessary
+            if (isTokenExpired(accessToken)) {
+                const refreshResult = await refreshToken(backendConfig.cloud.url, refreshTokenValue);
+                if (!refreshResult.success) {
+                    throw new Error('Failed to refresh token. Please run `hereya login` again.');
+                }
+                accessToken = refreshResult.accessToken;
+                refreshTokenValue = refreshResult.refreshToken;
+                await saveCloudCredentials({
+                    accessToken,
+                    clientId: backendConfig.cloud.clientId,
+                    refreshToken: refreshTokenValue,
+                    url: backendConfig.cloud.url,
+                });
+            }
             backend = new CloudBackend({
-                accessToken: credentials.accessToken,
+                accessToken,
                 clientId: backendConfig.cloud.clientId,
-                refreshToken: credentials.refreshToken,
+                refreshToken: refreshTokenValue,
                 url: backendConfig.cloud.url,
             });
             break;

package/oclif.manifest.json

@@ -978,31 +978,6 @@
         "index.js"
       ]
     },
-    "workspace:list": {
-      "aliases": [],
-      "args": {},
-      "description": "List workspaces.",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>"
-      ],
-      "flags": {},
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "workspace:list",
-      "pluginAlias": "hereya-cli",
-      "pluginName": "hereya-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "workspace",
-        "list",
-        "index.js"
-      ]
-    },
     "workspace:uninstall": {
       "aliases": [],
       "args": {
@@ -1067,6 +1042,31 @@
         "index.js"
       ]
     },
+    "workspace:list": {
+      "aliases": [],
+      "args": {},
+      "description": "List workspaces.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "workspace:list",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "workspace",
+        "list",
+        "index.js"
+      ]
+    },
     "workspace:env:set": {
       "aliases": [],
       "args": {},
@@ -1183,5 +1183,5 @@
       ]
     }
   },
-  "version": "0.37.2"
+  "version": "0.38.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hereya-cli",
   "description": "Infrastructure as Package",
-  "version": "0.37.2",
+  "version": "0.38.0",
   "author": "Hereya Developers",
   "bin": {
     "hereya": "./bin/run.js"
@@ -34,6 +34,7 @@
     "@oclif/prettier-config": "^0.2.1",
     "@oclif/test": "^4.1.9",
     "@types/chai": "^5.0.1",
+    "@types/jsonwebtoken": "^9.0.9",
     "@types/mocha": "^10.0.10",
     "@types/mock-fs": "^4.13.4",
     "@types/node": "^22",
@@ -44,6 +45,7 @@
     "eslint-config-oclif": "^6.0.10",
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-chai-friendly": "^1.0.1",
+    "jsonwebtoken": "^9.0.2",
     "mocha": "^11.1.0",
     "mock-fs": "^5.5.0",
     "nock": "^14.0.3",