Address comments

Author: minggangw

lib/node.js

@@ -259,10 +259,11 @@ class Node extends rclnodejs.ShadowNode {
         let timerInfo;
         if (typeof rclnodejs.callTimerWithInfo === 'function') {
           timerInfo = rclnodejs.callTimerWithInfo(timer.handle);
+          timer.callback(timerInfo);
         } else {
           rclnodejs.callTimer(timer.handle);
+          timer.callback();
         }
-        timer.callback(timerInfo);
       }
     });
 

src/rcl_timer_bindings.cpp

@@ -79,7 +79,12 @@ Napi::Value CreateTimer(const Napi::CallbackInfo& info) {
   bool lossless;
   int64_t period_nsec = info[2].As<Napi::BigInt>().Int64Value(&lossless);
   bool autostart = true;
-  if (info.Length() > 3 && info[3].IsBoolean()) {
+  if (info.Length() > 3) {
+    if (!info[3].IsBoolean()) {
+      Napi::TypeError::New(env, "Timer autostart must be a boolean")
+          .ThrowAsJavaScriptException();
+      return env.Undefined();
+    }
     autostart = info[3].As<Napi::Boolean>().Value();
   }
   rcl_timer_t* timer =

test/test-timer.js

@@ -16,6 +16,7 @@
 
 const assert = require('assert');
 const rclnodejs = require('../index.js');
+const rclnodejsNative = require('../lib/native_loader.js');
 const DistroUtils = require('../lib/distro.js');
 const sinon = require('sinon');
 
@@ -222,6 +223,39 @@ describe('rclnodejs Timer class testing', function () {
       rclnodejs.spin(node);
     });
 
+    it('timer callback preserves zero arguments when TimerInfo is unavailable', function (done) {
+      const originalFunc = rclnodejsNative.callTimerWithInfo;
+
+      try {
+        Object.defineProperty(rclnodejsNative, 'callTimerWithInfo', {
+          value: undefined,
+          configurable: true,
+          writable: true,
+        });
+      } catch (e) {
+        this.skip();
+        return;
+      }
+
+      const timer = node.createTimer(TIMER_INTERVAL, function () {
+        try {
+          assert.strictEqual(arguments.length, 0);
+          timer.cancel();
+          done();
+        } finally {
+          try {
+            Object.defineProperty(rclnodejsNative, 'callTimerWithInfo', {
+              value: originalFunc,
+              configurable: true,
+              writable: true,
+            });
+          } catch (e) {}
+        }
+      });
+
+      rclnodejs.spin(node);
+    });
+
     it('timer.setOnResetCallback', function (done) {
       if (DistroUtils.getDistroId() <= DistroUtils.getDistroId('humble')) {
         this.skip();
@@ -382,4 +416,15 @@ describe('rclnodejs Timer class coverage testing', function () {
       node.createTimer(TIMER_INTERVAL, () => {}, { autostart: 'false' });
     }, /options\.autostart/);
   });
+
+  it('native createTimer validates autostart argument type', function () {
+    assert.throws(() => {
+      rclnodejsNative.createTimer(
+        node.getClock().handle,
+        node.context.handle,
+        TIMER_INTERVAL,
+        'false'
+      );
+    }, /Timer autostart must be a boolean/);
+  });
 });