@ixon-cdk/core 1.1.0-next.2 → 1.1.0-next.3

package/api/base.service.js

@@ -5,6 +5,19 @@ const ConfigService = require('../config/config.service');
 module.exports = class ApiBaseService {
   _configSrv = new ConfigService();
 
+  /**
+   * Returns the amount of seconds between when the `.accesstoken` file was last modified relative
+   * to now, or `-1` when the file doesn't exist.
+   * */
+  _getAccessTokenFileModifiedRelativeToNow() {
+    if (fs.existsSync(this._getAccessTokenFilePath())) {
+      const stats = fs.statSync(this._getAccessTokenFilePath());
+      return Math.floor((new Date().getTime() - stats.mtimeMs) / 1000);
+    }
+    return -1;
+  }
+
+  /** Returns an absolute path to the `.accesstoken` file. */
   _getAccessTokenFilePath() {
     return path.join(require('../utils').getRootDir(), '.accesstoken');
   }
@@ -28,9 +41,11 @@ module.exports = class ApiBaseService {
   _getSecretId() {
     let secretId;
     try {
-      secretId = fs.readFileSync(this._getAccessTokenFilePath(), {
-        encoding: 'utf-8',
-      });
+      // If the `.accesstoken` file's modified time exceeds the standard expiry time of 24 hours,
+      // we'll make the assumption that it is no longer a valid access-token.
+      if (this._getAccessTokenFileModifiedRelativeToNow() < 86400) {
+        secretId = fs.readFileSync(this._getAccessTokenFilePath(), { encoding: 'utf-8' });
+      }
     } catch {
       // do nothing
     }

package/config/config.service.js

@@ -6,21 +6,32 @@ const { getRootDir, logFileCrudMessage, logErrorMessage } = require('../utils');
 module.exports = class ConfigService {
   _config = { components: {} };
 
-  constructor(configFile = 'config.json') {
-    this._path = path.join(getRootDir(), configFile);
+  constructor(configFile) {
+    // When the CDK is part of a larger project workspace it may be desirable to have a more explicit config-file name. Therefore, unless
+    // a specific config file path was defined in the contructor, we'll first try to find `cdk.config.json`, before falling back to the
+    // default file name `config.json`.
+    if (configFile !== undefined) {
+      this._path = path.join(getRootDir(), configFile);
+    } else {
+      if (fs.existsSync(path.join(getRootDir(), 'cdk.config.json'))) {
+        this._path = path.join(getRootDir(), 'cdk.config.json');
+      } else {
+        this._path = path.join(getRootDir(), 'config.json');
+      }
+    }
 
     let config;
 
     if (!fs.existsSync(this._path)) {
       logErrorMessage('No config file.');
-      process.exit();
+      process.exit(1);
     }
 
     try {
       config = require(this._path);
     } catch {
       logErrorMessage("Couldn't parse config file.");
-      process.exit();
+      process.exit(1);
     }
 
     this._config = config;
@@ -38,6 +49,10 @@ module.exports = class ConfigService {
     return this._config.newComponentRoot || 'components';
   }
 
+  getOutputPath() {
+    return this._config.outputPath || 'dist';
+  }
+
   getPrefix() {
     return this._config.prefix || null;
   }
@@ -60,7 +75,11 @@ module.exports = class ConfigService {
   }
 
   extendComponent(name, config) {
-    this._config.components[name] = merge({}, this._config.components[name], config);
+    this._config.components[name] = merge(
+      {},
+      this._config.components[name],
+      config,
+    );
     this._sync();
   }
 

package/config/schema.d.ts

@@ -7,6 +7,11 @@ export interface schema {
    * @default "components"
    */
   newComponentRoot?: string;
+  /**
+   * The path where the build output will be written, relative to the current workspace root.
+   * @default "dist"
+   */
+  outputPath?: string;
   /**
    * API application ID
    * @default "LtDdZKEPa5lK"

package/config/schema.json

@@ -7,6 +7,11 @@
       "description": "The path where new components will be created, relative to the workspace root.",
       "default": "components"
     },
+    "outputPath": {
+      "type": "string",
+      "description": "The path where the build output will be written, relative to the current workspace root.",
+      "default": "dist"
+    },
     "apiApplication": {
       "type": "string",
       "description": "API application ID",

package/http-request.js

@@ -11,14 +11,14 @@ module.exports = function request(options) {
 
     if (typeof customRequest !== 'function') {
       logErrorMessage('The custom "http-request.js" file must export a function.');
-      process.exit();
+      process.exit(1);
     }
 
     const promise = customRequest(options);
 
     if (typeof promise !== 'object' || typeof promise.then !== 'function') {
       logErrorMessage('The exported function in the custom "http-request.js" file must return a Promise.');
-      process.exit();
+      process.exit(1);
     }
 
     return promise;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ixon-cdk/core",
-  "version": "1.1.0-next.2",
+  "version": "1.1.0-next.3",
   "description": "",
   "main": "index.js",
   "author": "",
@@ -11,6 +11,7 @@
     "axios": "^0.26.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
+    "cors": "^2.8.5",
     "crypto-js": "^4.1.1",
     "express": "^4.17.3",
     "glob": "^8.0.1",

package/server/index.js

@@ -1,12 +1,15 @@
 const path = require('path');
 const express = require('express');
+const cors = require('cors');
 const liveReload = require('livereload');
+const ApiBaseService = require('../api/base.service');
 const ConfigService = require('../config/config.service');
 
 const LR_PORT_DEFAULT = 35729;
 
 module.exports = class Server {
   constructor(opts) {
+    this._apiSrv = new ApiBaseService();
     this._configSrv = new ConfigService();
     this._rootDir = require('../utils').getRootDir();
     this._opts = {
@@ -63,6 +66,14 @@ module.exports = class Server {
     app.get(`/${this._opts.componentBasePath}/*`, (req, res) => {
       res.sendStatus(404);
     });
+    app.get(
+      '/access-token.txt',
+      cors({ origin: `http://localhost:${this._opts.port}` }),
+      (req, res) => {
+        res.type('text/plain');
+        res.send(this._apiSrv._getSecretId() || '');
+      },
+    );
     app.get('/config.json', (req, res) => {
       res.send({
         api: {
@@ -118,12 +129,12 @@ module.exports = class Server {
     if (name) {
       const prefix = this._configSrv.getPrefix();
       const tag = prefix ? `${prefix}-${name}` : name;
-      return `dist/${name}/${tag}.min.js`;
+      return `${this._getOutputDir(name)}/${tag}.min.js`;
     }
     return null;
   }
 
   _getOutputDir(name) {
-    return name ? `dist/${name}` : null;
+    return name ? `${this._configSrv.getOutputPath()}/${name}` : null;
   }
 };

package/template/template.service.js

@@ -28,7 +28,7 @@ module.exports = class TemplateService {
 
     if (!fs.existsSync(examplesRoot)) {
       logErrorMessage("Package 'ixoncloud/component-examples' is not installed.");
-      process.exit();
+      process.exit(1);
     }
 
     const examplesConfigSrv = new ConfigService('node_modules/component-examples/config.json');
@@ -36,7 +36,7 @@ module.exports = class TemplateService {
 
     if (!Object.keys(components).length) {
       logErrorMessage('No examples found.');
-      process.exit();
+      process.exit(1);
     }
 
     const exampleComponentRoot = examplesConfigSrv.getNewComponentRoot();
@@ -52,10 +52,10 @@ module.exports = class TemplateService {
     const exampleName = result.name;
 
     if (!exampleName) {
-      process.exit();
+      process.exit(1);
     } else if (!components[exampleName]) {
       logErrorMessage(`Example '${exampleName}' is not configured.`);
-      process.exit();
+      process.exit(1);
     }
 
     const { build } = components[exampleName].runner;

package/utils.js

@@ -80,7 +80,7 @@ const pascalCase = flow(camelCase, upperFirst);
 function apiHttpErrorToMessage(error) {
   if (typeof error === 'string') {
     logErrorMessage(error);
-    process.exit();
+    process.exit(1);
   }
   if (error && error.response && error.response.data) {
     const errors = error.response.data.data;
@@ -90,12 +90,12 @@ function apiHttpErrorToMessage(error) {
           .map((err) => (err.propertyName ? `${err.propertyName}: ${err.message}` : err.message))
           .join('\n'),
       );
-      process.exit();
+      process.exit(1);
     }
   }
   logErrorMessage('Unexpected error.');
   console.log(error);
-  process.exit();
+  process.exit(1);
 }
 
 function generatePreviewHash(templateId, templateName, versionId, versionNumber, versionMainPath) {