@timokunze/node-printer 0.6.7 → 0.6.9

package/README.md

@@ -2,24 +2,6 @@ Node Printer Prebuild
 ============
 Native bind printers on POSIX and Windows OS from Node.js, electron and node-webkit.
 
-[![npm version](https://badge.fury.io/js/@timokunze%2Fnode-printer.svg)](https://www.npmjs.com/package/@timokunze/node-printer) [![Prebuild Binaries and Publish](https://github.com/TimoKunze/node-printer/actions/workflows/prebuild-main.yml/badge.svg)](https://github.com/TimoKunze/node-printer/actions/workflows/prebuild-main.yml)
-
-> Me (TimoKunze) created this fork to upgrade dependencies since I ran into various issues with current versions of Node and Electron.
-
-> It just works with Node 12 because of @thiagoelg in his [PR](https://github.com/tojocky/node-printer/pull/261)
-
-> Prebuild and CI integration courtesy of @ekoeryanto in his [FORK](https://github.com/ekoeryanto/node-printer)
-
-If you have a problem, ask question to [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/tojocky/node-printer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) or find/create a new [Github issue](https://github.com/TimoKunze/node-printer/issues)
-
-___
-### **Below is the original README**
-___
-### Reason:
-
-I was involved in a project where I need to print from Node.JS. This is the reason why I created this project and I want to share my code with others.
-
-
 ### Features:
 
 * no dependecies;

package/binding.gyp

@@ -66,7 +66,7 @@
           ],
           "msvs_settings": {
             "VCCLCompilerTool": {
-              "AdditionalOptions": [ "-std:c++17", ],
+              "AdditionalOptions": [ "-std:c++20", ],
             },
           },
         }],
@@ -75,14 +75,14 @@
             "-stdlib=libc++"
           ],
           'xcode_settings': {
-            "OTHER_CPLUSPLUSFLAGS":["-std=c++17", "-stdlib=libc++"],
+            "OTHER_CPLUSPLUSFLAGS":["-std=c++20", "-stdlib=libc++"],
             "OTHER_LDFLAGS": ["-stdlib=libc++"],
             "MACOSX_DEPLOYMENT_TARGET": "14.0",
           },
         }],
         ['OS=="linux"', {
           'cflags_cc':[
-            "-std=c++17"
+            "-std=c++20"
           ]
         }],
       ]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@timokunze/node-printer",
   "description": "Node.js printer bindings",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "homepage": "https://github.com/TimoKunze/node-printer",
   "author": {
     "name": "Ion Lupascu",
@@ -17,12 +17,6 @@
     "type": "git",
     "url": "git://github.com/TimoKunze/node-printer.git"
   },
-  "devDependencies": {
-    "node-gyp": "^10.1.0",
-    "prebuild": "^13.0.0",
-    "node-abi": "^3.62.0",
-    "patch-package": "^8.0.0"
-  },
   "engines": {
     "node": ">= 18.0.0"
   },
@@ -45,9 +39,15 @@
     }
   ],
   "main": "./lib/printer",
+  "types": "types/index.d.ts",
+  "devDependencies": {
+    "node-gyp": "^10.1.0",
+    "prebuild": "^13.0.1",
+    "node-abi": "^3.71.0",
+    "patch-package": "^8.0.0"
+  },
   "dependencies": {
-    "nan": "^2.19.0",
+    "nan": "^2.22.0",
     "prebuild-install": "^7.1.2"
-  },
-  "types": "types/index.d.ts"
+  }
 }

package/patches/node-abi+3.71.0.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/node-abi/abi_registry.json b/node_modules/node-abi/abi_registry.json
+index 14b44af..afd561e 100644
+--- a/node_modules/node-abi/abi_registry.json	
++++ b/node_modules/node-abi/abi_registry.json
+@@ -337,7 +337,7 @@
+     "future": false,
+     "lts": false,
+     "runtime": "electron",
+-    "target": "32.0.0-alpha.1"
++    "target": "32.0.0"
+   },
+   {
+     "abi": "130",

package/src/macros.hh

@@ -12,11 +12,6 @@
 #  define MY_NODE_MODULE_HANDLESCOPE MY_NODE_MODULE_ISOLATE_DECL Nan::HandleScope scope
 #  define V8_VALUE_NEW(type, value)   v8::type::New(MY_NODE_MODULE_ISOLATE, value)
 #  define V8_VALUE_NEW_DEFAULT(type)   v8::type::New(MY_NODE_MODULE_ISOLATE)
-#  if NODE_MODULE_VERSION > 73
-#   define V8_STRING_NEW_2BYTES(value)   v8::String::NewFromTwoByte(MY_NODE_MODULE_ISOLATE, value).ToLocalChecked()
-#  else
-#    define V8_STRING_NEW_2BYTES(value)   v8::String::NewFromTwoByte(MY_NODE_MODULE_ISOLATE, value)
-#  endif
 
 #  define RETURN_EXCEPTION(msg)  isolate->ThrowException(Nan::Error(msg));    \
     return
@@ -43,11 +38,14 @@
 
 #if NODE_VERSION_AT_LEAST(4, 3, 0)
 #  define V8_STRING_NEW_UTF8(value)   v8::String::NewFromUtf8(MY_NODE_MODULE_ISOLATE, value, v8::NewStringType::kNormal).ToLocalChecked()
+#  define V8_STRING_NEW_2BYTES(value)   v8::String::NewFromTwoByte(MY_NODE_MODULE_ISOLATE, value, v8::NewStringType::kNormal).ToLocalChecked()
 #elif NODE_VERSION_AT_LEAST(0, 11, 10)
 #  if NODE_MODULE_VERSION > 73
 #    define V8_STRING_NEW_UTF8(value)   v8::String::NewFromUtf8(MY_NODE_MODULE_ISOLATE, value).ToLocalChecked()
+#    define V8_STRING_NEW_2BYTES(value)   v8::String::NewFromTwoByte(MY_NODE_MODULE_ISOLATE, value).ToLocalChecked()
 #  else
 #    define V8_STRING_NEW_UTF8(value)   v8::String::NewFromUtf8(MY_NODE_MODULE_ISOLATE, value)
+#    define V8_STRING_NEW_2BYTES(value)   v8::String::NewFromTwoByte(MY_NODE_MODULE_ISOLATE, value)
 #  endif
 #endif
 

package/src/node_printer_posix.cc

@@ -310,14 +310,14 @@ MY_NODE_MODULE_CALLBACK(getDefaultPrinterName)
     MY_NODE_MODULE_HANDLESCOPE;
     //This does not return default user printer name according to https://www.cups.org/documentation.php/doc-2.0/api-cups.html#cupsGetDefault2
     //so leave as undefined and JS implementation will loop in all printers
-    /*
-    const char * printerName = cupsGetDefault();
+
+    const char * printerName = NULL; //cupsGetDefault();
 
     // return default printer name only if defined
     if(printerName != NULL) {
         MY_NODE_MODULE_RETURN_VALUE(V8_STRING_NEW_UTF8(printerName));
     }
-    */
+
     MY_NODE_MODULE_RETURN_UNDEFINED();
 }