edge-functions 2.2.0-stage.2 → 2.2.0-stage.3

package/.prettierignore

@@ -2,4 +2,5 @@ examples/*
 jsdoc/*
 yarn.lock
 CHANGELOG.md
-docker-compose.yml
+docker-compose.yml
+CODEOWNERS

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [2.2.0-stage.3](https://github.com/aziontech/vulcan/compare/v2.2.0-stage.2...v2.2.0-stage.3) (2023-12-13)
+
+
+### Bug Fixes
+
+* loop in fs polyfill when readdirSync and path / ([4c1e2d0](https://github.com/aziontech/vulcan/commit/4c1e2d0195eaf04bf86ce4995ac41c9e2de5c596))
+* loop in fs polyfill when readdirSync and path / ([#197](https://github.com/aziontech/vulcan/issues/197)) ([bd56c75](https://github.com/aziontech/vulcan/commit/bd56c75d8e48dd8af7792710aa51f68d7f737521))
+
 ## [2.2.0-stage.2](https://github.com/aziontech/vulcan/compare/v2.2.0-stage.1...v2.2.0-stage.2) (2023-12-06)
 
 

package/CODEOWNERS

@@ -1,2 +1 @@
-* @jotanarciso
-* @MagnunAVFAzion
+* @jotanarciso @MagnunAVFAzion @enicio @jcbsfilho @tiagokrebs

package/lib/build/bundlers/polyfills/node/fs.js

@@ -294,7 +294,7 @@ function getOptions(options, defaultOptions = kEmptyObject) {
 /**
  * Closes the file descriptor.
  * @param {number} fd
- * @param {(err?: Error) => any} [callback]
+ * @param {function(Error): any} [callback]
  * @returns {void}
  */
 function close(fd, callback = defaultCloseCallback) {
@@ -316,12 +316,9 @@ function closeSync(fd) {
 /**
  * Asynchronously opens a file.
  * @param {string | Buffer | URL} path
- * @param {string | number} [flags]
- * @param {string | number} [mode]
- * @param {(
- *   err?: Error,
- *   fd?: number
- *   ) => any} callback
+ * @param {string | number} [flags='r']
+ * @param {string | number} [mode=0o666]
+ * @param {function(Error, number): any} [callback]
  * @returns {void}
  */
 function open(path, flags, mode, callback) {
@@ -382,11 +379,9 @@ function openSync(path, flags, mode) {
 /**
  * Asynchronously gets the stats of a file.
  * @param {string | Buffer | URL} path
- * @param {{ bigint?: boolean; }} [options]
- * @param {(
- *   err?: Error,
- *   stats?: any
- *   ) => any} callback
+ * @param {Object} [options] - Options object.
+ * @param {boolean} [options.bigint=false]
+ * @param {function(Error, any): any} [callback]
  * @returns {void}
  */
 async function stat(path, options = { bigint: false }, callback) {
@@ -426,14 +421,13 @@ async function stat(path, options = { bigint: false }, callback) {
  * Synchronously retrieves the `fs.Stats`
  * for the `path`.
  * @param {string | Buffer | URL} path
- * @param {{
- *   bigint?: boolean;
- *   throwIfNoEntry?: boolean;
- *   }} [options]
+ * @param {Object} [options]
+ * @param {boolean} [options.bigint]
+ * @param {boolean} [options.throwIfNoEntry]
  * @returns {any}
  */
 function statSync(path, options) {
-  // checks final /
+  // checks final
   path = getValidatedPath(path);
 
   // Synchronous method to get file information
@@ -463,15 +457,11 @@ function statSync(path, options) {
 /**
  * Asynchronously reads the entire contents of a file.
  * @param {string | Buffer | URL | number} path
- * @param {{
- *   encoding?: string | null;
- *   flag?: string;
- *   signal?: AbortSignal;
- *   } | string} [options]
- * @param {(
- *   err?: Error,
- *   data?: string | Buffer
- *   ) => any} callback
+ * @param {Object | string} [options] - Options object or encoding string.
+ * @param {string} [options.encoding] - The file encoding.
+ * @param {string} [options.flag] - The flag.
+ * @param {AbortSignal} [options.signal] - The signal.
+ * @param {function(Error, (string | Buffer))} callback - Callback function.
  * @returns {void}
  */
 function readFile(path, options, callback) {
@@ -507,10 +497,9 @@ function readFile(path, options, callback) {
 /**
  * Synchronously reads the entire contents of a file.
  * @param {string | Buffer | URL | number} path
- * @param {{
- *   encoding?: string | null;
- *   flag?: string;
- *   }} [options]
+ * @param {Object | string} [options] - Options object or encoding string.
+ * @param {string} [options.encoding] - The file encoding.
+ * @param {string} [options.flag] - The flag.
  * @returns {string | Buffer}
  */
 function readFileSync(path, options) {
@@ -537,13 +526,10 @@ function readFileSync(path, options) {
 
 /**
  * Synchronously reads the contents of a directory.
- * @param {string | Buffer | URL} path
- * @param {string | {
- *   encoding?: string;
- *   withFileTypes?: boolean;
- *   recursive?: boolean;
- *   }} [options]
- * @returns {string | Buffer[] | Dirent[]}
+ * @param {string | Object} [options] - Options object or encoding string.
+ * @param {string} [options.encoding] - The encoding.
+ * @param {boolean} [options.withFileTypes] - Whether to include file types.
+ * @param {boolean} [options.recursive] - Whether to include subdirectories.
  */
 function readdirSync(path, options) {
   path = getValidatedPath(path);
@@ -563,14 +549,20 @@ function readdirSync(path, options) {
   const matchedElements = filesInfos.paths.filter(
     (dir) => dir.startsWith(path) && path !== dir,
   );
-  const elementsInDir = [
-    ...new Set(
-      matchedElements.map(
-        (element) => element.replace(`${path}/`, '').split('/')[0],
+  let elementsInDir;
+  if (path === '/') {
+    elementsInDir = matchedElements.filter(
+      (element) => !element.substring(1).includes('/'),
+    );
+  } else {
+    elementsInDir = [
+      ...new Set(
+        matchedElements.map(
+          (element) => element.replace(`${path}/`, '').split('/')[0],
+        ),
       ),
-    ),
-  ];
-
+    ];
+  }
   // generate the list of elements in dir (strings or Dirents)
   if (options.withFileTypes) {
     result = elementsInDir.map((element) => {
@@ -617,5 +609,4 @@ export {
   readdirSync,
   promises,
 };
-
 /* eslint-enable */

package/lib/commands/deploy.commands.js

@@ -27,39 +27,49 @@ async function directoryExists(dirPath) {
  * Then, it will upload static files and deploy the application.
  * Finally, it watches for the propagation of the deployment.
  * @returns {Promise<void>} - A promise that resolves when the deployment is complete.
+ * @param {string} functionID - Function ID will be updated.
  * @example
  *
  * deployCommand();
  */
-async function deployCommand() {
-  const { core } = await import('#platform');
+async function deployCommand(functionID) {
+  const { core, functions } = await import('#platform');
   const { getVulcanBuildId } = await import('#utils');
 
   const versionId = getVulcanBuildId();
   const staticsPath = join(process.cwd(), '/.edge/storage');
 
-  const answers = await prompt([
-    {
-      type: 'input',
-      name: 'applicationName',
-      message:
-        'Enter the name of the application (optional, leave empty for random name):',
-    },
-    {
-      type: 'input',
-      name: 'functionName',
-      message:
-        'Enter the name of the function (optional, leave empty for random name):',
-    },
-  ]);
+  if (functionID) {
+    if (await directoryExists(staticsPath)) {
+      await core.actions.uploadStatics(versionId, staticsPath);
+    }
+    await functions.actions.updateFunction(functionID);
+  }
+  if (!functionID) {
+    const answers = await prompt([
+      {
+        type: 'input',
+        name: 'applicationName',
+        message:
+          'Enter the name of the application (optional, leave empty for random name):',
+      },
+      {
+        type: 'input',
+        name: 'functionName',
+        message:
+          'Enter the name of the function (optional, leave empty for random name):',
+      },
+    ]);
+
+    const { applicationName, functionName } = answers;
 
-  const { applicationName, functionName } = answers;
+    if (await directoryExists(staticsPath)) {
+      await core.actions.uploadStatics(versionId, staticsPath);
+    }
 
-  if (await directoryExists(staticsPath)) {
-    await core.actions.uploadStatics(versionId, staticsPath);
+    const domain = await core.actions.deploy(applicationName, functionName);
+    core.actions.watchPropagation(domain);
   }
-  const domain = await core.actions.deploy(applicationName, functionName);
-  core.actions.watchPropagation(domain);
 }
 
 export default deployCommand;

package/lib/main.js

@@ -151,9 +151,10 @@ function startVulcanProgram() {
     program
       .command('deploy')
       .description('Create and deploy an application with a function')
-      .action(async () => {
+      .option('--functionID <id>', 'Function ID to deploy')
+      .action(async (options) => {
         const { deployCommand } = await import('#commands');
-        await deployCommand();
+        await deployCommand(options?.functionID);
       });
   }
 

package/lib/platform/actions/function/updateFunction.actions.js

@@ -0,0 +1,83 @@
+import fs from 'fs';
+import path from 'path';
+
+import { debug } from '#utils';
+import { Platform } from '#namespaces';
+import FunctionService from '../../services/function.service.js';
+
+/**
+ * @function
+ * @memberof Platform
+ * Get the initiator type based on the code signature.
+ * @param {string} code - The code for the function.
+ * @returns {string} The initiator type.
+ */
+function getInitiatorType(code) {
+  const fetchSignature = "addEventListener('fetch'";
+  const firewallSignature = "addEventListener('firewall'";
+
+  if (code.includes(fetchSignature)) {
+    return 'edge_application';
+  }
+  if (code.includes(firewallSignature)) {
+    return 'edge_firewall';
+  }
+  return 'edge_application';
+}
+
+/**
+ * @function
+ * @memberof Platform
+ * @description Updates an existing function (worker) for the edge application.
+ * It reads the function code and arguments from the respective '.edge/worker.js'
+ * and '.edge/args.json' files, and infers the initiator type based on the function's code.
+ * @param {string} [functionId] - The id of the function to be updated.
+ * If not provided, the id is determined from the function's code.
+ * @returns {Promise<object>} A promise that resolves with the details of the updated
+ * function. The object returned contains details such as the function ID, name, code,
+ * language, initiator type, arguments, and activation status.
+ * @throws {Error} If the function update fails, possibly due to invalid code or
+ * function arguments, or due to a problem with the FunctionService.
+ * @example
+ * try {
+ *    const functionDetails = await updateFunction('myFunctionId');
+ *    console.log(`Function updated with ID: ${functionDetails.id}`);
+ * } catch (error) {
+ *    console.error('Failed to update function:', error);
+ * }
+ */
+async function updateFunction(functionId) {
+  try {
+    // get code
+    const workerFilePath = path.join(process.cwd(), '.edge/worker.js');
+    const code = fs.readFileSync(workerFilePath, 'utf8');
+
+    // get json_args
+    const argsFilePath = path.join(process.cwd(), '.edge/args.json');
+    let jsonArgs = {};
+    if (fs.existsSync(argsFilePath)) {
+      const argsData = fs.readFileSync(argsFilePath, 'utf8');
+      jsonArgs = JSON.parse(argsData);
+    }
+
+    // get initiator_type
+    const initiatorType = getInitiatorType(code);
+
+    const payload = {
+      code,
+      initiator_type: initiatorType,
+      json_args: jsonArgs,
+      active: true,
+    };
+
+    const response = await (
+      await FunctionService.update(functionId, payload)
+    ).json();
+    return response.results;
+  } catch (error) {
+    debug.error(error);
+    throw error;
+  }
+}
+
+export default updateFunction;

package/lib/platform/index.js

@@ -14,6 +14,7 @@ import setFunctionAsDefaultRule from './actions/application/setFunctionAsDefault
 
 // function
 import showFunctionLogs from './actions/function/showFunctionLogs.actions.js';
+import updateFunction from './actions/function/updateFunction.actions.js';
 
 /**
  * Object containing core-related actions.
@@ -58,9 +59,10 @@ const domains = {
  * @typedef {object} FunctionsObject
  * @property {object} actions - Object containing Azion function actions.
  * @property {showFunctionLogs} actions.showFunctionLogs - Action to perform Azion function logs.
+ * @property {updateFunction} actions.updateFunction - Action to update Azion function.
  */
 const functions = {
-  actions: { showFunctionLogs },
+  actions: { showFunctionLogs, updateFunction },
 };
 
 export { core, applications, domains, functions };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "edge-functions",
   "type": "module",
-  "version": "2.2.0-stage.2",
+  "version": "2.2.0-stage.3",
   "description": "Tool to launch and build JavaScript/Frameworks. This tool automates polyfills for Edge Computing and assists in creating Workers, notably for the Azion platform.",
   "main": "lib/main.js",
   "bin": {