rclnodejs 0.31.0 → 0.32.1

package/README.md

@@ -45,7 +45,7 @@ npm i rclnodejs@x.y.z
 
 |                                      RCLNODEJS Version                                       |                                                             Compatible ROS 2 LTS                                                             |
 | :------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------: |
-| latest version (currently [v0.31.0](https://github.com/RobotWebTools/rclnodejs/tree/0.31.0)) | [Humble](https://github.com/RobotWebTools/rclnodejs/tree/humble-hawksbill)<br>[Jazzy](https://github.com/RobotWebTools/rclnodejs/tree/jazzy) |
+| latest version (currently [v0.32.1](https://github.com/RobotWebTools/rclnodejs/tree/0.32.1)) | [Humble](https://github.com/RobotWebTools/rclnodejs/tree/humble-hawksbill)<br>[Jazzy](https://github.com/RobotWebTools/rclnodejs/tree/jazzy) |
 
 ## Documentation
 

package/lib/action/client.js

@@ -172,7 +172,7 @@ class ActionClient extends Entity {
           goalHandle.status = status;
 
           // Remove done handles from the list
-          // eslint-disable-next-line max-depth
+
           if (
             status === ActionInterfaces.GoalStatus.STATUS_SUCCEEDED ||
             status === ActionInterfaces.GoalStatus.STATUS_CANCELED ||

package/lib/clock_type.js

@@ -14,8 +14,6 @@
 
 'use strict';
 
-/* eslint-disable camelcase */
-
 /**
  * Enum for ClockType
  * @readonly

package/lib/distro.js

@@ -63,7 +63,7 @@ const DistroUtils = {
       return process.env.ROS_DISTRO;
     }
 
-    return [...DistroNameIdMap].find(([key, val]) => val == distroId)[0];
+    return [...DistroNameIdMap].find(([, val]) => val == distroId)[0];
   },
 
   getKnownDistroNames: function () {

package/lib/interface_loader.js

@@ -59,7 +59,6 @@ let interfaceLoader = {
     // Suppose the name is a package, and traverse the path to collect the IDL files.
     let packagePath = path.join(generator.generatedRoot, name);
 
-    // eslint-disable-next-line
     let interfaces = fs.readdirSync(packagePath);
     if (interfaces.length > 0) {
       return this.loadInterfaceByPath(packagePath, interfaces);
@@ -108,7 +107,7 @@ let interfaceLoader = {
         packageName,
         packageName + '__' + type + '__' + messageName + '.js'
       );
-      // eslint-disable-next-line
+
       if (fs.existsSync(filePath)) {
         return require(filePath);
       }

package/lib/lifecycle.js

@@ -588,8 +588,6 @@ class LifecycleNode extends Node {
    * @throws {Error} If transition is invalid for the current state.
    */
   shutdown(callbackReturnValue) {
-    let state = this.currentState;
-
     return this._changeState(SHUTDOWN_TRANSITION_LABEL, callbackReturnValue);
   }
 
@@ -603,7 +601,6 @@ class LifecycleNode extends Node {
   _onGetState(request, response) {
     let result = response.template;
 
-    // eslint-disable-next-line camelcase
     result.current_state = this.currentState;
 
     response.send(result);
@@ -619,7 +616,6 @@ class LifecycleNode extends Node {
   _onGetAvailableStates(request, response) {
     let result = response.template;
 
-    // eslint-disable-next-line camelcase
     result.available_states = this.availableStates;
 
     response.send(result);
@@ -634,7 +630,6 @@ class LifecycleNode extends Node {
   _onGetAvailableTransitions(request, response) {
     let result = response.template;
 
-    // eslint-disable-next-line camelcase
     result.available_transitions = this.availableTransitions;
 
     response.send(result);

package/lib/lifecycle_publisher.js

@@ -37,7 +37,7 @@ class LifecyclePublisher extends Publisher {
    * Publish a message only when activated; otherwise do nothing (nop);
    *
    * @param {object|Buffer} message - The message to be sent, could be kind of JavaScript message generated from .msg
-   *                                                          or be a Buffer for a raw message.
+   *                                  or be a Buffer for a raw message.
    * @returns {undefined}
    */
   publish(message) {

package/lib/node.js

@@ -1496,7 +1496,7 @@ class Node extends rclnodejs.ShadowNode {
       );
     }
 
-    // publish ParameterEvent
+    // Publish ParameterEvent.
     this._parameterEventPublisher.publish(parameterEvent);
 
     return {
@@ -1549,7 +1549,7 @@ class Node extends rclnodejs.ShadowNode {
       // detect invalid parameter
       try {
         parameter.validate();
-      } catch (e) {
+      } catch {
         return {
           successful: false,
           reason: `Invalid ${parameter.name}`,
@@ -1577,7 +1577,7 @@ class Node extends rclnodejs.ShadowNode {
       if (parameter.type != ParameterType.PARAMETER_NOT_SET) {
         try {
           descriptor.validateParameter(parameter);
-        } catch (e) {
+        } catch {
           return {
             successful: false,
             reason: `Parameter ${parameter.name} does not  readonly`,

package/lib/parameter.js

@@ -1,5 +1,3 @@
-/* eslint-disable camelcase */
-
 // Copyright (c) 2020 Wayne Parrott. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +20,6 @@
 'use strict';
 
 const IsClose = require('is-close');
-const rclnodejs = require('bindings')('rclnodejs');
 
 /**
  * The plus/minus tolerance for determining number equivalence.
@@ -274,7 +271,6 @@ class ParameterDescriptor {
   static fromParameter(parameter) {
     const name = parameter.name;
     const type = parameter.type;
-    const value = parameter.value;
     return new ParameterDescriptor(name, type, 'Created from parameter.');
   }
 
@@ -387,7 +383,7 @@ class ParameterDescriptor {
       return;
     }
     if (!(range instanceof Range)) {
-      throw TypeException('Expected instance of Range.');
+      throw TypeError('Expected instance of Range.');
     }
     if (!range.isValidType(this.type)) {
       throw TypeError('Incompatible Range');
@@ -443,14 +439,14 @@ class ParameterDescriptor {
     // ensure parameter is valid
     try {
       parameter.validate();
-    } catch (e) {
+    } catch {
       throw new TypeError('Parameter is invalid');
     }
 
     // ensure this descriptor is valid
     try {
       this.validate();
-    } catch (e) {
+    } catch {
       throw new Error('Descriptor is invalid.');
     }
 
@@ -567,6 +563,7 @@ class Range {
    * @param {ParameterType} parameterType - The parameter type to test.
    * @return {boolean} - True if parameterType is compatible; otherwise return false.
    */
+  // eslint-disable-next-line no-unused-vars
   isValidType(parameterType) {
     return false;
   }
@@ -702,6 +699,7 @@ class IntegerRange extends Range {
  * @param {any} value - The value to infer it's ParameterType
  * @returns {ParameterType} - The ParameterType that best scribes the value.
  */
+// eslint-disable-next-line no-unused-vars
 function parameterTypeFromValue(value) {
   if (!value) return ParameterType.PARAMETER_NOT_SET;
   if (typeof value === 'boolean') return ParameterType.PARAMETER_BOOL;
@@ -778,8 +776,7 @@ function validValue(value, type) {
     case ParameterType.PARAMETER_INTEGER_ARRAY:
     case ParameterType.PARAMETER_DOUBLE_ARRAY:
     case ParameterType.PARAMETER_STRING_ARRAY:
-      const values = value;
-      result = _validArray(values, type);
+      result = _validArray(value, type);
       break;
     default:
       result = false;

package/lib/parameter_service.js

@@ -1,4 +1,3 @@
-/* eslint-disable max-depth */
 // Copyright (c) 2020 Wayne Parrott. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +14,6 @@
 
 'use strict';
 
-const rclnodejs = require('bindings')('rclnodejs');
 const { Parameter, PARAMETER_SEPARATOR } = require('./parameter.js');
 
 /**
@@ -27,6 +25,7 @@ const { Parameter, PARAMETER_SEPARATOR } = require('./parameter.js');
  *  rcl_interfaces/srv/GetParameters
  *  rcl_interfaces/srv/SetParameters
  *  rcl_interfaces/srv/SetParametersAtomically
+ *  rcl_interfaces/srv/GetParameterTypes
  *
  * Call start() to begin receiving client request.
  * All service requests are forwarded to the node this service works for.

package/lib/publisher.js

@@ -38,7 +38,7 @@ class Publisher extends Entity {
   /**
    * Publish a message
    * @param {object|Buffer} message - The message to be sent, could be kind of JavaScript message generated from .msg
-   *                                                          or be a Buffer for a raw message.
+   *                                  or be a Buffer for a raw message.
    * @return {undefined}
    */
   publish(message) {

package/lib/qos.js

@@ -14,8 +14,6 @@
 
 'use strict';
 
-/* eslint-disable */
-
 /**
  * Enum for HistoryPolicy
  * @readonly

package/lib/rate.js

@@ -1,4 +1,3 @@
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

package/lib/rmw.js

@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 'use strict';
 
 const DistroUtils = require('./distro');

package/lib/time_source.js

@@ -17,7 +17,6 @@
 const rclnodejs = require('bindings')('rclnodejs');
 const { Clock, ROSClock } = require('./clock.js');
 const { ClockType } = Clock;
-const Node = require('./node.js');
 const { Parameter, ParameterType } = require('./parameter.js');
 const Time = require('./time.js');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rclnodejs",
-  "version": "0.31.0",
+  "version": "0.32.1",
   "description": "ROS2.0 JavaScript client with Node.js",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -17,17 +17,17 @@
     "build:dev": "node-gyp -j 16 build --debug",
     "rebuild": "npm run clean && node-gyp -j 16 rebuild",
     "rebuild:dev": "npm run clean && node-gyp -j 16 rebuild --debug",
-    "generate-messages": "node scripts/generate_messages.js",
-    "generate-messages:dev": "node scripts/generate_messages.js --debug",
+    "generate-messages": "node scripts/generate_messages.js && node scripts/generate_tsd.js",
+    "generate-messages:dev": "node scripts/generate_messages.js --debug && node scripts/generate_tsd.js",
     "clean": "node-gyp clean && rimraf ./generated",
     "install": "npm run rebuild",
     "postinstall": "npm run generate-messages",
     "docs": "cd docs && make",
-    "test": "node --expose-gc ./scripts/run_test.js && npm run dtslint",
-    "dtslint": "node scripts/generate_tsd.js",
-    "lint": "eslint --max-warnings=0 --ext js,ts index.js types scripts lib example rosidl_gen rosidl_parser test benchmark/rclnodejs && node ./scripts/cpplint.js",
+    "test": "nyc node --expose-gc ./scripts/run_test.js && npx tsd",
+    "lint": "eslint && node ./scripts/cpplint.js",
     "format": "clang-format -i -style=file ./src/*.cpp ./src/*.hpp && prettier --write \"{lib,rosidl_gen,rostsd_gen,rosidl_parser,types,example,test,scripts,benchmark}/**/*.{js,md,ts}\" ./*.{js,md,ts}",
-    "prepare": "husky"
+    "prepare": "husky",
+    "coverage": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
   },
   "bin": {
     "generate-ros-messages": "./scripts/generate_messages.js"
@@ -43,46 +43,45 @@
     "type": "git",
     "url": "git+https://github.com/RobotWebTools/rclnodejs.git"
   },
-  "//": "Pin deep-equal to ^1.1.1",
   "devDependencies": {
-    "@babel/eslint-parser": "^7.25.9",
+    "@eslint/js": "^10.0.0",
+    "@types/node": "^22.13.9",
     "@typescript-eslint/eslint-plugin": "^8.18.0",
     "@typescript-eslint/parser": "^8.18.0",
-    "babel-eslint": "^10.1.0",
     "clang-format": "^1.8.0",
     "commander": "^13.1.0",
-    "deep-equal": "^1.1.1",
+    "coveralls": "^3.1.1",
+    "deep-equal": "^2.2.3",
     "eslint": "^9.16.0",
-    "eslint-config-prettier": "^10.0.1",
+    "eslint-config-prettier": "^10.0.2",
     "eslint-plugin-prettier": "^5.2.1",
+    "globals": "^16.0.0",
     "husky": "^9.1.7",
     "jsdoc": "^4.0.4",
     "lint-staged": "^15.2.10",
     "mocha": "^11.0.2",
+    "nyc": "^17.1.0",
     "sinon": "^19.0.2",
     "tree-kill": "^1.2.2",
-    "typescript": "^5.7.2"
+    "tsd": "^0.31.2",
+    "typescript": "^5.7.2",
+    "uuid": "^11.0.3"
   },
   "dependencies": {
     "@rclnodejs/ref-array-di": "^1.2.2",
     "@rclnodejs/ref-napi": "^4.0.0",
     "@rclnodejs/ref-struct-di": "^1.1.1",
-    "array.prototype.flat": "^1.3.2",
     "bindings": "^1.5.0",
     "compare-versions": "^6.1.1",
     "debug": "^4.4.0",
     "dot": "^1.1.3",
-    "dtslint": "^4.2.1",
     "fs-extra": "^11.2.0",
-    "json-bigint": "^1.0.0",
     "is-close": "^1.3.3",
-    "mkdirp": "^3.0.1",
-    "mz": "^2.7.0",
+    "json-bigint": "^1.0.0",
     "nan": "^2.22.0",
+    "prettier": "^3.4.2",
     "rimraf": "^6.0.1",
-    "uuid": "^11.0.3",
-    "walk": "^2.3.15",
-    "prettier": "^3.4.2"
+    "walk": "^2.3.15"
   },
   "husky": {
     "hooks": {
@@ -97,6 +96,9 @@
       "clang-format -i -style=file"
     ]
   },
+  "tsd": {
+    "directory": "test/types"
+  },
   "engines": {
     "node": ">= 16.13.0"
   }

package/rosidl_gen/action_msgs.js

@@ -12,7 +12,6 @@
 
 'use strict';
 
-/* eslint-disable camelcase */
 const GOAL_ID_FIELD = {
   name: 'goal_id',
   type: {

package/rosidl_gen/filter.js

@@ -1,3 +1,17 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+'use strict';
+
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
@@ -73,7 +87,6 @@ const RosPackageFilters = {
 
     if (!fs.existsSync(blocklistPath)) return;
 
-    // eslint-disable-next-line
     let blocklistData = JSON.parse(fs.readFileSync(blocklistPath, 'utf8'));
 
     let filters = blocklistData.map((pkgFilterData) => {

package/rosidl_gen/generator.json

@@ -1,6 +1,6 @@
 {
   "name": "rosidl-generator",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Generate JavaScript object from ROS IDL(.msg) files",
   "main": "index.js",
   "authors": [

package/rosidl_gen/index.js

@@ -64,7 +64,6 @@ async function generateAll(forcedGenerating) {
 
 const generator = {
   version() {
-    // eslint-disable-next-line
     return fse.readJsonSync(path.join(__dirname, 'generator.json')).version;
   },
 

package/rosidl_gen/message_translator.js

@@ -14,10 +14,6 @@
 
 'use strict';
 
-/* eslint-disable max-depth */
-
-const debug = require('debug')('rclnodejs:message_translator');
-
 function isTypedArray(value) {
   return ArrayBuffer.isView(value) && !(value instanceof DataView);
 }
@@ -39,7 +35,6 @@ function copyMsgObject(msg, obj) {
           // It's an array
           if (typeof obj[i][0] === 'object') {
             // It's an array of objects: converting to ROS message objects
-
             // 1. Extract the element-type first
             // 2. Build the array by translate every elements
             let msgArray = [];
@@ -66,8 +61,7 @@ function copyMsgObject(msg, obj) {
 function verifyMessage(message, obj) {
   if (message.constructor.isROSArray) {
     // It's a ROS message array
-    //  Note: there won't be any JavaScript array in message
-
+    // Note: there won't be any JavaScript array in message.
     if (!Array.isArray(obj)) {
       return false;
     }
@@ -131,13 +125,12 @@ function toPlainObject(message, enableTypedArray = true) {
 
   if (message.constructor.isROSArray) {
     // It's a ROS message array
-    //  Note: there won't be any JavaScript array in message
+    // Note: there won't be any JavaScript array in message.
     let array = [];
     message.data.forEach((e) => {
       array.push(toPlainObject(e, enableTypedArray)); // Translate every elements
     });
     return array;
-    // eslint-disable-next-line no-else-return
   } else {
     // It's a ROS message
     const def = message.constructor.ROSMessageDef;

package/rosidl_gen/packages.js

@@ -20,7 +20,6 @@ const readline = require('readline');
 const path = require('path');
 const walk = require('walk');
 const os = require('os');
-const flat = require('array.prototype.flat');
 const pkgFilters = require('../rosidl_gen/filter.js');
 
 const fsp = fs.promises;
@@ -193,8 +192,7 @@ async function findAmentPackagesInDirectory(dir) {
     pkgs.map((pkg) => getPackageDefinitionsFiles(pkg, dir))
   );
 
-  // Support flat() method for nodejs < 11.
-  const rosFiles = Array.prototype.flat ? files.flat() : flat(files);
+  const rosFiles = files.flat();
   const pkgMap = new Map();
   await Promise.all(
     rosFiles.map((filePath) => addInterfaceInfos(filePath, dir, pkgMap))

package/rosidl_gen/primitive_types.js

@@ -18,8 +18,6 @@ const ref = require('@rclnodejs/ref-napi');
 const StructType = require('@rclnodejs/ref-struct-di')(ref);
 const rclnodejs = require('bindings')('rclnodejs');
 
-/* eslint-disable camelcase */
-
 const StringRefStruct = StructType({
   data: ref.types.CString,
   size: ref.types.size_t,
@@ -65,5 +63,3 @@ module.exports = {
   wstring: StringRefStruct,
   initString: initString,
 };
-
-/* eslint-enable camelcase */

package/rosidl_gen/templates/message.dot

@@ -824,6 +824,10 @@ class {{=arrayWrapper}} {
   get classType() {
     return {{=arrayWrapper}};
   }
+
+  toPlainObject(enableTypedArray) {
+    return translator.toPlainObject(this, enableTypedArray);
+  }
 }
 
 {{? it.spec.constants != undefined && it.spec.constants.length}}

package/rostsd_gen/index.js

@@ -1,6 +1,3 @@
-/* eslint-disable max-depth */
-/* eslint-disable no-sync */
-/* eslint-disable camelcase */
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

package/scripts/cpplint.js

@@ -18,10 +18,9 @@ const exec = require('child_process').exec;
 
 const cmd = 'wget -nc ';
 const cpplintUrl =
-  'https://raw.githubusercontent.com/google/styleguide' +
-  '/gh-pages/cpplint/cpplint.py';
+  'https://raw.githubusercontent.com/cpplint/cpplint/refs/heads/develop/cpplint.py';
 const root = `${__dirname}/../src`;
-const args = `--extensions=cpp,h,hpp,cc ${root}/*`;
+const args = `--filter=-build/include_subdir,-whitespace/indent_namespace --extensions=cpp,h,hpp,cc ${root}/*`;
 
 console.log('Downloading the cpplint...');
 exec(cmd + cpplintUrl, (err, stdout, stderr) => {
@@ -29,7 +28,7 @@ exec(cmd + cpplintUrl, (err, stdout, stderr) => {
     console.log(`Downloading failed: ${stderr}`);
   } else {
     console.log('Running the cpplint...');
-    exec('python cpplint.py ' + args, (err, stdout, stderr) => {
+    exec('python3 cpplint.py ' + args, (err, stdout, stderr) => {
       console.log(stdout);
       if (err) {
         console.log(stderr);

package/scripts/generate_messages.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 
-/* eslint-disable camelcase */
 // Copyright (c) 2018 Intel Corporation. All rights reserved.
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+/* eslint-disable camelcase */
 'use strict';
 
 const generator = require('../rosidl_gen/index.js');

package/scripts/npmjs-readme.md

@@ -45,7 +45,7 @@ npm i rclnodejs@x.y.z
 
 |                                      RCLNODEJS Version                                       |                                                             Compatible ROS 2 LTS                                                             |
 | :------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------: |
-| latest version (currently [v0.31.0](https://github.com/RobotWebTools/rclnodejs/tree/0.31.0)) | [Humble](https://github.com/RobotWebTools/rclnodejs/tree/humble-hawksbill)<br>[Jazzy](https://github.com/RobotWebTools/rclnodejs/tree/jazzy) |
+| latest version (currently [v0.32.1](https://github.com/RobotWebTools/rclnodejs/tree/0.32.1)) | [Humble](https://github.com/RobotWebTools/rclnodejs/tree/humble-hawksbill)<br>[Jazzy](https://github.com/RobotWebTools/rclnodejs/tree/jazzy) |
 
 ## Documentation
 

package/scripts/ros_distro.js

@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 'use strict';
 
 const DistroUtils = require('../lib/distro');

package/scripts/run_test.js

@@ -19,8 +19,6 @@ const Mocha = require('mocha');
 const os = require('os');
 const path = require('path');
 
-let rootDir = path.dirname(__dirname);
-
 fs.remove(path.join(path.dirname(__dirname), 'generated'), (err) => {
   if (!err) {
     let mocha = new Mocha();

package/src/executor.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLNODEJS_EXECUTOR_HPP_
-#define RCLNODEJS_EXECUTOR_HPP_
+#ifndef SRC_EXECUTOR_HPP_
+#define SRC_EXECUTOR_HPP_
 
 #include <rcl/wait.h>
 #include <uv.h>
@@ -74,4 +74,4 @@ class Executor {
 
 }  // namespace rclnodejs
 
-#endif
+#endif  // SRC_EXECUTOR_HPP_

package/src/handle_manager.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLNODEJS_HANDLE_MANAGER_HPP_
-#define RCLNODEJS_HANDLE_MANAGER_HPP_
+#ifndef SRC_HANDLE_MANAGER_HPP_
+#define SRC_HANDLE_MANAGER_HPP_
 
 #include <nan.h>
 #include <rcl/wait.h>
@@ -132,4 +132,4 @@ class HandleManager {
 
 }  // namespace rclnodejs
 
-#endif
+#endif  // SRC_HANDLE_MANAGER_HPP_

package/src/macros.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLNODEJS_MARCOS_HPP_
-#define RCLNODEJS_MARCOS_HPP_
+#ifndef SRC_MACROS_HPP_
+#define SRC_MACROS_HPP_
 
 #include "rcutils/logging_macros.h"
 
@@ -43,4 +43,4 @@
 #define RCLNODEJS_DEBUG(...)
 #endif
 
-#endif
+#endif  // SRC_MACROS_HPP_