node-libcec 1.0.1 → 1.0.3

package/README.md

@@ -28,7 +28,7 @@ npm install node-libcec
 ## Quick Start
 
 ```javascript
-const { CECAdapter, LogicalAddress, DeviceType } = require('node-libcec');
+import { CECAdapter, LogicalAddress, DeviceType } from 'node-libcec';
 
 // Create adapter
 const cec = new CECAdapter({
@@ -164,7 +164,7 @@ cec.on('configurationChanged', (config) => { }); // Config changes
 ### Constants
 
 ```javascript
-const {
+import {
   LogicalAddress,   // TV, RECORDING_DEVICE_1, PLAYBACK_DEVICE_1, etc.
   DeviceType,       // TV, RECORDING_DEVICE, PLAYBACK_DEVICE, etc.
   PowerStatus,      // ON, STANDBY, IN_TRANSITION_*, UNKNOWN
@@ -174,7 +174,7 @@ const {
   DisplayControl,   // DISPLAY_FOR_DEFAULT_TIME, DISPLAY_UNTIL_CLEARED, etc.
   Version,          // V1_2, V1_3, V1_4, V2_0, etc.
   AlertType         // SERVICE_DEVICE, CONNECTION_LOST, etc.
-} = require('node-libcec');
+} from 'node-libcec';
 ```
 
 ## Examples

package/lib/constants.js

@@ -1,7 +1,7 @@
 /**
  * CEC Logical Addresses
  */
-const LogicalAddress = {
+export const LogicalAddress = {
   TV: 0,
   RECORDING_DEVICE_1: 1,
   RECORDING_DEVICE_2: 2,
@@ -24,7 +24,7 @@ const LogicalAddress = {
 /**
  * CEC Device Types
  */
-const DeviceType = {
+export const DeviceType = {
   TV: 0,
   RECORDING_DEVICE: 1,
   RESERVED: 2,
@@ -36,7 +36,7 @@ const DeviceType = {
 /**
  * CEC Power Status
  */
-const PowerStatus = {
+export const PowerStatus = {
   ON: 0x00,
   STANDBY: 0x01,
   IN_TRANSITION_STANDBY_TO_ON: 0x02,
@@ -47,7 +47,7 @@ const PowerStatus = {
 /**
  * CEC Opcodes
  */
-const Opcode = {
+export const Opcode = {
   ACTIVE_SOURCE: 0x82,
   IMAGE_VIEW_ON: 0x04,
   TEXT_VIEW_ON: 0x0D,
@@ -125,7 +125,7 @@ const Opcode = {
 /**
  * CEC User Control Codes (Remote buttons)
  */
-const UserControlCode = {
+export const UserControlCode = {
   SELECT: 0x00,
   UP: 0x01,
   DOWN: 0x02,
@@ -219,7 +219,7 @@ const UserControlCode = {
 /**
  * CEC Log Level
  */
-const LogLevel = {
+export const LogLevel = {
   ERROR: 1,
   WARNING: 2,
   NOTICE: 4,
@@ -231,7 +231,7 @@ const LogLevel = {
 /**
  * CEC Display Control (for OSD strings)
  */
-const DisplayControl = {
+export const DisplayControl = {
   DISPLAY_FOR_DEFAULT_TIME: 0x00,
   DISPLAY_UNTIL_CLEARED: 0x40,
   CLEAR_PREVIOUS_MESSAGE: 0x80,
@@ -241,7 +241,7 @@ const DisplayControl = {
 /**
  * CEC Version
  */
-const Version = {
+export const Version = {
   UNKNOWN: 0x00,
   V1_2: 0x01,
   V1_2A: 0x02,
@@ -254,7 +254,7 @@ const Version = {
 /**
  * Alert Types
  */
-const AlertType = {
+export const AlertType = {
   SERVICE_DEVICE: 1,
   CONNECTION_LOST: 2,
   PERMISSION_ERROR: 3,
@@ -262,14 +262,3 @@ const AlertType = {
   PHYSICAL_ADDRESS_ERROR: 5
 };
 
-module.exports = {
-  LogicalAddress,
-  DeviceType,
-  PowerStatus,
-  Opcode,
-  UserControlCode,
-  LogLevel,
-  DisplayControl,
-  Version,
-  AlertType
-};

package/lib/index.js

@@ -1,18 +1,24 @@
-const EventEmitter = require('events');
+import { EventEmitter } from 'events';
+import { createRequire } from 'module';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+
+const require = createRequire(import.meta.url);
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 // Load native addon
 let native;
 try {
-  native = require('../build/Release/cec.node');
+  native = require(join(__dirname, '../build/Release/cec.node'));
 } catch (e) {
   try {
-    native = require('../build/Debug/cec.node');
+    native = require(join(__dirname, '../build/Debug/cec.node'));
   } catch (e2) {
     throw new Error('Failed to load native cec module. Did you run npm run build?');
   }
 }
 
-const constants = require('./constants');
+import * as constants from './constants.js';
 
 /**
  * CEC Adapter class - provides high-level interface to libcec
@@ -427,7 +433,5 @@ class CECAdapter extends EventEmitter {
 }
 
 // Export everything
-module.exports = {
-  CECAdapter,
-  ...constants
-};
+export { CECAdapter };
+export * from './constants.js';

package/package.json

@@ -1,13 +1,20 @@
 {
   "name": "node-libcec",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Node.js bindings for libcec - control CEC devices over HDMI",
+  "type": "module",
   "main": "lib/index.js",
+  "exports": {
+    ".": "./lib/index.js"
+  },
   "scripts": {
     "build": "node-gyp rebuild",
     "clean": "node-gyp clean",
     "prepare": "npm run build",
-    "test": "node --test test/"
+    "test": "node --test test/",
+    "release:patch": "npm version patch && npm publish",
+    "release:minor": "npm version minor && npm publish",
+    "release:major": "npm version major && npm publish"
   },
   "keywords": [
     "cec",
@@ -43,4 +50,4 @@
     "node-gyp": "^10.0.0"
   },
   "gypfile": true
-}
+}

package/src/native/cec_callbacks.cc

@@ -158,7 +158,7 @@ void CECCallbackHandler::LogMessageCallback(void* cbParam, const cec_log_message
         message->time
     };
 
-    handler->logMessageTsfn_.BlockingCall(data, [](Napi::Env env, Napi::Function jsCallback, LogMessageData* data) {
+    handler->logMessageTsfn_.NonBlockingCall(data, [](Napi::Env env, Napi::Function jsCallback, LogMessageData* data) {
         Napi::Object obj = Napi::Object::New(env);
         obj.Set("message", Napi::String::New(env, data->message));
         obj.Set("level", Napi::Number::New(env, data->level));
@@ -183,7 +183,7 @@ void CECCallbackHandler::KeyPressCallback(void* cbParam, const cec_keypress* key
         static_cast<int>(key->duration)
     };
 
-    handler->keyPressTsfn_.BlockingCall(data, [](Napi::Env env, Napi::Function jsCallback, KeyPressData* data) {
+    handler->keyPressTsfn_.NonBlockingCall(data, [](Napi::Env env, Napi::Function jsCallback, KeyPressData* data) {
         Napi::Object obj = Napi::Object::New(env);
         obj.Set("keycode", Napi::Number::New(env, data->keycode));
         obj.Set("duration", Napi::Number::New(env, data->duration));
@@ -217,7 +217,7 @@ void CECCallbackHandler::CommandReceivedCallback(void* cbParam, const cec_comman
         std::vector<uint8_t>(command->parameters.data, command->parameters.data + command->parameters.size)
     };
 
-    handler->commandTsfn_.BlockingCall(data, [](Napi::Env env, Napi::Function jsCallback, CommandData* data) {
+    handler->commandTsfn_.NonBlockingCall(data, [](Napi::Env env, Napi::Function jsCallback, CommandData* data) {
         Napi::Object obj = Napi::Object::New(env);
         obj.Set("initiator", Napi::Number::New(env, data->initiator));
         obj.Set("destination", Napi::Number::New(env, data->destination));
@@ -256,7 +256,7 @@ void CECCallbackHandler::ConfigurationChangedCallback(void* cbParam, const libce
         config->iHDMIPort
     };
 
-    handler->configChangedTsfn_.BlockingCall(data, [](Napi::Env env, Napi::Function jsCallback, ConfigChangedData* data) {
+    handler->configChangedTsfn_.NonBlockingCall(data, [](Napi::Env env, Napi::Function jsCallback, ConfigChangedData* data) {
         Napi::Object obj = Napi::Object::New(env);
         obj.Set("deviceName", Napi::String::New(env, data->deviceName));
         obj.Set("physicalAddress", Napi::Number::New(env, data->physicalAddress));
@@ -280,7 +280,7 @@ void CECCallbackHandler::AlertCallback(void* cbParam, const libcec_alert type, c
         static_cast<int>(type)
     };
 
-    handler->alertTsfn_.BlockingCall(data, [](Napi::Env env, Napi::Function jsCallback, AlertData* data) {
+    handler->alertTsfn_.NonBlockingCall(data, [](Napi::Env env, Napi::Function jsCallback, AlertData* data) {
         Napi::Object obj = Napi::Object::New(env);
         obj.Set("type", Napi::Number::New(env, data->alertType));
         jsCallback.Call({obj});
@@ -303,7 +303,7 @@ void CECCallbackHandler::SourceActivatedCallback(void* cbParam, const cec_logica
         activated != 0
     };
 
-    handler->sourceActivatedTsfn_.BlockingCall(data, [](Napi::Env env, Napi::Function jsCallback, SourceActivatedData* data) {
+    handler->sourceActivatedTsfn_.NonBlockingCall(data, [](Napi::Env env, Napi::Function jsCallback, SourceActivatedData* data) {
         Napi::Object obj = Napi::Object::New(env);
         obj.Set("logicalAddress", Napi::Number::New(env, data->logicalAddress));
         obj.Set("activated", Napi::Boolean::New(env, data->activated));