edhoc 1.2.3 → 1.3.1

package/binding.gyp

@@ -6,7 +6,7 @@
     {
       "target_name": "bindings",
       'defines': [
-        'NAPI_DISABLE_CPP_EXCEPTIONS=1',
+        'NAPI_CPP_EXCEPTIONS=1',
         'CONFIG_LIBEDHOC_ENABLE=1',
         'CONFIG_LIBEDHOC_MAX_NR_OF_CIPHER_SUITES=9',
         'CONFIG_LIBEDHOC_MAX_LEN_OF_CONN_ID=7',
@@ -38,7 +38,7 @@
       'cflags!': [ '-fno-exceptions', '-std=c99' ],
       'cflags_cc!': [ '-fno-exceptions', '-std=c++20' ],
       'xcode_settings': {
-        'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',
+        'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
         'CLANG_CXX_LIBRARY': 'libc++',
         'CLANG_CXX_LANGUAGE_STANDARD': 'c++20',
         'MACOSX_DEPLOYMENT_TARGET': '12'

package/dist/edhoc.d.ts

@@ -292,6 +292,10 @@ export declare class EDHOC {
      * @param crypto A crypto manager to handle cryptographic functions.
      */
     constructor(connectionID: EdhocConnectionID, methods: EdhocMethod[], suites: EdhocSuite[], credentials: EdhocCredentialManager, crypto: EdhocCryptoManager);
+    /**
+     * Resets the EDHOC context.
+     */
+    reset(): void;
     /**
      * Composes the first EDHOC message.
      * @param ead Optional array of EAD objects to include in the message.

package/dist/edhoc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edhoc.d.ts","sourceRoot":"","sources":["../lib/edhoc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"edhoc.d.ts","sourceRoot":"","sources":["../lib/edhoc.ts"],"names":[],"mappings":"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"}

package/include/{LibEDHOC.h → Binding.h}

@@ -3,47 +3,50 @@
 
 #include <napi.h>
 
-#include "UserContext.h"
+#include "EdhocCredentialManager.h"
+#include "EdhocCryptoManager.h"
+#include "EdhocEadManager.h"
+#include "RunningContext.h"
 
 extern "C" {
 #include "edhoc.h"
 }
 
 /**
- * @class LibEDHOC
- * @brief A class that represents the LibEDHOC object.
+ * @class Edhoc
+ * @brief A class that represents the Edhoc object.
  *
- * The LibEDHOC class is a wrapper around the EDHOC library and provides
+ * The Edhoc class is a wrapper around the EDHOC library and provides
  * an interface for performing EDHOC operations. It allows users to
  * initialize the EDHOC context, set connection identifiers, set the
  * method used in EDHOC, set cipher suites, set a logger function, and
  * compose/process EDHOC messages.
  */
-class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
+class Edhoc : public Napi::ObjectWrap<Edhoc> {
  public:
   /**
-   * @brief Initializes the LibEDHOC object.
+   * @brief Initializes the Edhoc object.
    *
-   * This static method is used to initialize the LibEDHOC object and
+   * This static method is used to initialize the Edhoc object and
    * bind it to the provided JavaScript environment.
    *
    * @param env The Napi::Env representing the JavaScript environment.
    * @param exports The Napi::Object representing the exports object.
-   * @return Napi::Object The initialized LibEDHOC object.
+   * @return Napi::Object The initialized Edhoc object.
    */
   static Napi::Object Init(Napi::Env env, Napi::Object exports);
 
   /**
-   * @brief Constructs a LibEDHOC object.
+   * @brief Constructs a Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    */
-  LibEDHOC(const Napi::CallbackInfo& info);
+  Edhoc(const Napi::CallbackInfo& info);
 
   /**
-   * @brief Destroys the LibEDHOC object.
+   * @brief Destroys the Edhoc object.
    */
-  ~LibEDHOC();
+  ~Edhoc();
 
   /**
    * @brief Gets the connection identifier (C_I or C_R depending on the role).
@@ -86,7 +89,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
    * @brief Gets the Method (RFC 9528: 3.2.) used in EDHOC.
    *
    * This method returns the Method (RFC 9528: 3.2.) used in EDHOC
-   * associated with the LibEDHOC object.
+   * associated with the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @return Napi::Value The supported methods used in EDHOC.
@@ -97,7 +100,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
    * @brief Sets the Method (RFC 9528: 3.2.) used in EDHOC.
    *
    * This method sets the supported methods (RFC 9528: 3.2.) used in EDHOC for
-   * the LibEDHOC object.
+   * the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @param value The Napi::Value representing the supported methods used in EDHOC.
@@ -107,7 +110,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Gets the selected method.
    *
-   * This method returns the selected method associated with the LibEDHOC object.
+   * This method returns the selected method associated with the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @return Napi::Value The selected method.
@@ -117,7 +120,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Sets the cipher suites.
    *
-   * This method sets the cipher suites for the LibEDHOC object.
+   * This method sets the cipher suites for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @param value The Napi::Value representing the cipher suites.
@@ -127,7 +130,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Gets the cipher suites.
    *
-   * This method returns the cipher suites associated with the LibEDHOC object.
+   * This method returns the cipher suites associated with the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @return Napi::Value The cipher suites.
@@ -137,7 +140,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Gets the selected cipher suite.
    *
-   * This method returns the selected cipher suite associated with the LibEDHOC
+   * This method returns the selected cipher suite associated with the Edhoc
    * object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
@@ -148,7 +151,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Gets the logger function.
    *
-   * This method returns the logger function associated with the LibEDHOC
+   * This method returns the logger function associated with the Edhoc
    * object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
@@ -159,17 +162,27 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Sets the logger function.
    *
-   * This method sets the logger function for the LibEDHOC object.
+   * This method sets the logger function for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @param value The Napi::Value representing the logger function.
    */
   void SetLogger(const Napi::CallbackInfo& info, const Napi::Value& value);
-
+  
+  /**
+   * @brief Resets the EDHOC context.
+   *
+   * This method resets the EDHOC context for the Edhoc object.
+   *
+   * @param info The Napi::CallbackInfo representing the callback information.
+   * @return Napi::Value void.
+   */
+  void Reset(const Napi::CallbackInfo& info);
+  
   /**
    * @brief Composes EDHOC message 1.
    *
-   * This method composes EDHOC message 1 for the LibEDHOC object.
+   * This method composes EDHOC message 1 for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @return Napi::Value The composed EDHOC message 1.
@@ -179,7 +192,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Processes EDHOC message 1.
    *
-   * This method processes EDHOC message 1 for the LibEDHOC object.
+   * This method processes EDHOC message 1 for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @return Napi::Value The EAD data from message 1 or Null.
@@ -189,7 +202,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Composes EDHOC message 2.
    *
-   * This method composes EDHOC message 2 for the LibEDHOC object.
+   * This method composes EDHOC message 2 for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @return Napi::Value The composed EDHOC message 2.
@@ -199,7 +212,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Processes EDHOC message 2.
    *
-   * This method processes EDHOC message 2 for the LibEDHOC object.
+   * This method processes EDHOC message 2 for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @return Napi::Value The EAD data from message 2 or Null.
@@ -209,7 +222,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Composes EDHOC message 3.
    *
-   * This method composes EDHOC message 3 for the LibEDHOC object.
+   * This method composes EDHOC message 3 for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @return Napi::Value The composed EDHOC message 3.
@@ -219,7 +232,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Processes EDHOC message 3.
    *
-   * This method processes EDHOC message 3 for the LibEDHOC object.
+   * This method processes EDHOC message 3 for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @return Napi::Value The EAD data from message 3 or Null.
@@ -229,7 +242,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Composes EDHOC message 4.
    *
-   * This method composes EDHOC message 4 for the LibEDHOC object.
+   * This method composes EDHOC message 4 for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @return Napi::Value The composed EDHOC message 4.
@@ -239,7 +252,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Processes EDHOC message 4.
    *
-   * This method processes EDHOC message 4 for the LibEDHOC object.
+   * This method processes EDHOC message 4 for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @return Napi::Value The EAD data from message 4 or Null.
@@ -250,7 +263,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
    * @brief Exports OSCORE.
    *
    * This method exports an OSCORE context object containing the master key,
-   * salt, recipient ID, and sender ID for the LibEDHOC object.
+   * salt, recipient ID, and sender ID for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @return Napi::Value The exported OSCORE context object.
@@ -272,7 +285,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Performs a key update.
    *
-   * This method performs a key update for the LibEDHOC object.
+   * This method performs a key update for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @return Napi::Value void.
@@ -280,18 +293,25 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   Napi::Value KeyUpdate(const Napi::CallbackInfo& info);
 
  private:
-  struct edhoc_context context;  ///< The EDHOC context.
+  
+  std::unique_ptr<edhoc_context> edhocContext_;  ///< The EDHOC context.
 
-  struct edhoc_connection_id cid;  ///< RFC 9528: 3.3.2. Representation of Byte String Identifiers.
+  std::unique_ptr<RunningContext> runningContext_;  ///< The running context.
 
-  Napi::FunctionReference logger;  ///< N-API reference to the logger function
+  struct edhoc_connection_id cid_;  ///< RFC 9528: 3.3.2. Representation of Byte String Identifiers.
+  
+  Napi::FunctionReference logger_;  ///< N-API reference to the logger function
+  
+  std::unique_ptr<EdhocCryptoManager> cryptoManager_;          ///< The crypto manager
+  
+  std::unique_ptr<EdhocEadManager> eadManager_;                ///< The EAD manager
+  
+  std::unique_ptr<EdhocCredentialManager> credentialManager_;  ///< The credential manager
 
-  // Private member variables to hold instances of EDHOC managers for
-  // cryptographic operations, EAD, and credentials
-  std::shared_ptr<UserContext> userContext;
+  void StartRunningContext(Napi::Env env);
 
   /**
-   * @brief Logger function for the LibEDHOC object.
+   * @brief Logger function for the Edhoc object.
    *
    * This static method is used to log messages from the EDHOC library.
    *
@@ -305,7 +325,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Composes an EDHOC message.
    *
-   * This method is used to compose an EDHOC message for the LibEDHOC object.
+   * This method is used to compose an EDHOC message for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @param message The EDHOC message to compose.
@@ -316,7 +336,7 @@ class LibEDHOC : public Napi::ObjectWrap<LibEDHOC> {
   /**
    * @brief Processes an EDHOC message.
    *
-   * This method is used to process an EDHOC message for the LibEDHOC object.
+   * This method is used to process an EDHOC message for the Edhoc object.
    *
    * @param info The Napi::CallbackInfo representing the callback information.
    * @param message The EDHOC message to process.

package/include/EdhocComposeAsyncWorker.h

@@ -2,9 +2,10 @@
 #define EDHOC_COMPOSE_ASYNC_WORKER_H
 
 #include <napi.h>
-
 #include <vector>
 
+#include "RunningContext.h"
+
 extern "C" {
 #include "edhoc.h"
 }
@@ -15,20 +16,13 @@ extern "C" {
  */
 class EdhocComposeAsyncWorker : public Napi::AsyncWorker {
  public:
-  /**
-   * @brief The type definition for the callback function.
-   */
-  using CallbackType = std::function<void(Napi::Env&)>;
-
   /**
    * @brief Constructor for EdhocComposeAsyncWorker.
-   * @param env The Napi::Env object.
-   * @param context The EDHOC context.
+   * @param runningContext The pointer to the running context.
    * @param messageNumber The message number.
-   * @param callback The callback function.
    */
-  EdhocComposeAsyncWorker(Napi::Env& env, struct edhoc_context& context, int messageNumber, CallbackType callback);
-
+  EdhocComposeAsyncWorker(RunningContext* runningContext, int messageNumber);
+  
   /**
    * @brief Executes the asynchronous worker task.
    */
@@ -46,18 +40,10 @@ class EdhocComposeAsyncWorker : public Napi::AsyncWorker {
    */
   void OnError(const Napi::Error& error) override;
 
-  /**
-   * @brief Returns the promise object.
-   * @return The promise object.
-   */
-  Napi::Promise GetPromise();
-
  private:
-  Napi::Promise::Deferred deferred;      ///< The deferred promise object.
-  struct edhoc_context& context;         ///< The EDHOC context.
-  int messageNumber;                     ///< The message number.
-  CallbackType callback;                 ///< The callback function.
-  std::vector<uint8_t> composedMessage;  ///< The composed message.
+  RunningContext* runningContext_;        ///< The pointer to the running context.
+  int messageNumber_;                     ///< The message number.
+  std::vector<uint8_t> composedMessage_;  ///< The composed message.
 };
 
 #endif  // EDHOC_COMPOSE_ASYNC_WORKER_H

package/include/EdhocCredentialManager.h

@@ -7,6 +7,8 @@ extern "C" {
 #include "edhoc.h"
 }
 
+class RunningContext;
+
 /**
  * @class EdhocCredentialManager
  * @brief The EdhocCredentialManager class manages the credentials required for
@@ -18,14 +20,14 @@ class EdhocCredentialManager {
 
   /**
    * @struct edhoc_credentials
-   * @brief Libedhoc's bind structure for authentication credentials.
+   * @brief Edhoc's bind structure for authentication credentials.
    */
   struct edhoc_credentials credentials;
 
   /**
    * @brief Constructs an EdhocCredentialManager object.
    */
-  EdhocCredentialManager(Napi::Object& jsCredentialManager);
+  EdhocCredentialManager(Napi::Object& jsCredentialManager, Napi::Object& jsEdhoc);
 
   /**
    * @brief Destroys the EdhocCredentialManager object.
@@ -62,7 +64,7 @@ class EdhocCredentialManager {
    * fetched credentials.
    * @return EDHOC_SUCCESS if successful, otherwise an error code.
    */
-  int callFetchCredentials(const void* user_context, struct edhoc_auth_creds* credentials);
+  int callFetchCredentials(RunningContext* runningContext, struct edhoc_auth_creds* credentials);
 
   /**
    * @brief Calls the VerifyCredentials function.
@@ -73,33 +75,15 @@ class EdhocCredentialManager {
    * @param public_key_length Pointer to the length of the public key.
    * @return EDHOC_SUCCESS if successful, otherwise an error code.
    */
-  int callVerifyCredentials(const void* user_context,
+  int callVerifyCredentials(RunningContext* runningContext,
                             struct edhoc_auth_creds* credentials,
                             const uint8_t** public_key_reference,
                             size_t* public_key_length);
 
-  /**
-   * @brief Sets up the async functions.
-   */
-  void SetupAsyncFunctions();
-
-  /**
-   * @brief Releases the async functions.
-   */
-  void CleanupAsyncFunctions();
-
  private:
-  std::vector<Napi::Reference<Napi::Object>> credentialReferences;  ///< References to the JS objects
-  Napi::ObjectReference credentialManagerRef;                       ///< Reference to the JS object
-  Napi::ThreadSafeFunction fetchTsfn;                               ///< Thread-safe function for FetchCredentials
-  Napi::ThreadSafeFunction verifyTsfn;                              ///< Thread-safe function for VerifyCredentials
-  
-  /**
-   * @brief Assosciates the thread-safe function with the JS object function.
-   * @param name The name of the function in the JS credential manager object.
-   * @param tsfn The thread-safe function.
-   */
-  void SetFunction(const char* name, Napi::ThreadSafeFunction& tsfn);
+  std::vector<Napi::Reference<Napi::Object>> credentialReferences_;  ///< References to the JS objects
+  Napi::ObjectReference credentialManagerRef_;                       ///< Reference to the JS object
+  Napi::ObjectReference edhocRef_;
 };
 
 #endif  // EDHOC_CREDENTIAL_MANAGER_H