@timokunze/node-printer 0.6.4 → 0.6.5

package/README.md

@@ -4,6 +4,8 @@ Native bind printers on POSIX and Windows OS from Node.js, electron and node-web
 
 [![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)
@@ -52,7 +54,7 @@ See [examples](https://github.com/TimoKunze/node-printer/tree/main/examples)
 
 ### Contibutors:
 
-* Timo Kunze
+* Timo Kunze, @timokunze
 * Thiago Lugli, @thiagoelg
 * Eko Eryanto, @ekoeryanto
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@timokunze/node-printer",
   "description": "Node.js printer bindings",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "homepage": "https://github.com/TimoKunze/node-printer",
   "author": {
     "name": "Ion Lupascu",

package/src/node_printer_win.cc

@@ -76,6 +76,7 @@ namespace{
 #define STATUS_PRINTER_ADD(value, type) result.insert(std::make_pair(value, type))
         STATUS_PRINTER_ADD("BUSY", PRINTER_STATUS_BUSY);
         STATUS_PRINTER_ADD("DOOR-OPEN", PRINTER_STATUS_DOOR_OPEN);
+        STATUS_PRINTER_ADD("DRIVER_UPDATE_NEEDED", PRINTER_STATUS_DRIVER_UPDATE_NEEDED);
         STATUS_PRINTER_ADD("ERROR", PRINTER_STATUS_ERROR);
         STATUS_PRINTER_ADD("INITIALIZING", PRINTER_STATUS_INITIALIZING);
         STATUS_PRINTER_ADD("IO-ACTIVE", PRINTER_STATUS_IO_ACTIVE);
@@ -94,6 +95,7 @@ namespace{
         STATUS_PRINTER_ADD("POWER-SAVE", PRINTER_STATUS_POWER_SAVE);
         STATUS_PRINTER_ADD("PRINTING", PRINTER_STATUS_PRINTING);
         STATUS_PRINTER_ADD("PROCESSING", PRINTER_STATUS_PROCESSING);
+        STATUS_PRINTER_ADD("SERVER-OFFLINE", PRINTER_STATUS_SERVER_OFFLINE);
         STATUS_PRINTER_ADD("SERVER-UNKNOWN", PRINTER_STATUS_SERVER_UNKNOWN);
         STATUS_PRINTER_ADD("TONER-LOW", PRINTER_STATUS_TONER_LOW);
         STATUS_PRINTER_ADD("USER-INTERVENTION", PRINTER_STATUS_USER_INTERVENTION);
@@ -150,6 +152,7 @@ namespace{
 #define ATTRIBUTE_PRINTER_ADD(value, type) result.insert(std::make_pair(value, type))
         ATTRIBUTE_PRINTER_ADD("DIRECT", PRINTER_ATTRIBUTE_DIRECT);
         ATTRIBUTE_PRINTER_ADD("DO-COMPLETE-FIRST", PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST);
+        ATTRIBUTE_PRINTER_ADD("ENABLE-BIDI", PRINTER_ATTRIBUTE_ENABLE_BIDI);
         ATTRIBUTE_PRINTER_ADD("ENABLE-DEVQ", PRINTER_ATTRIBUTE_ENABLE_DEVQ);
         ATTRIBUTE_PRINTER_ADD("HIDDEN", PRINTER_ATTRIBUTE_HIDDEN);
         ATTRIBUTE_PRINTER_ADD("KEEPPRINTEDJOBS", PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS);
@@ -170,6 +173,7 @@ namespace{
         ATTRIBUTE_PRINTER_ADD("MACHINE", PRINTER_ATTRIBUTE_MACHINE);
         ATTRIBUTE_PRINTER_ADD("PUSHED-USER", PRINTER_ATTRIBUTE_PUSHED_USER);
         ATTRIBUTE_PRINTER_ADD("PUSHED-MACHINE", PRINTER_ATTRIBUTE_PUSHED_MACHINE);
+        ATTRIBUTE_PRINTER_ADD("TS_GENERIC_DRIVER", PRINTER_ATTRIBUTE_TS_GENERIC_DRIVER);
 #endif
         // server 2003
 #ifdef PRINTER_ATTRIBUTE_TS

package/types/index.d.ts

@@ -54,4 +54,6 @@ export interface JobDetails {
     processingTime: Date;
 }
 
-export type JobStatus = 'PAUSED' | 'PRINTING' | 'PRINTED' | 'CANCELLED' | 'PENDING' | 'ABORTED';
+export type JobStatus = 'PAUSED' | 'PRINTING' | 'PRINTED' | 'CANCELLED' | 'PENDING' | 'ABORTED';
+
+declare module '@timokunze/node-printer';

package/tools/buildElectronLinux.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-VERSION=$1
-
-# # Build Electron Linux 64bit
-node-pre-gyp configure --target=$VERSION --arch=x64 --dist-url=https://electronjs.org/headers --module_name=node_printer --module_path=../lib/
-node-pre-gyp build package --runtime=electron --target=$VERSION --target_arch=x64 --build-from-source
-
-# #Build Electron Linux 32bit
-node-pre-gyp configure --target=$VERSION --arch=ia32 --dist-url=https://electronjs.org/headers --module_name=node_printer --module_path=../lib/
-node-pre-gyp build package --runtime=electron --target=$VERSION --target_arch=ia32 --build-from-source

package/tools/buildElectronWindows.ps1

@@ -1,20 +0,0 @@
-#
-# Usage: buildElectronWindows.ps1 <version>
-#
-
-if ($args.Length -ne 1) {
-  echo "Must Supply only 1 argument - Version"
-  return
-}
-
-$version = $args[0]
-
-echo "Building Electron Version -> $version"
-
-# Build Electron Windows 64bit
-node_modules\.bin\node-pre-gyp.cmd configure --target=$version --arch=x64 --dist-url=https://electronjs.org/headers --module_name=node_printer
-node_modules\.bin\node-pre-gyp.cmd build package --runtime=electron --target=$version --target_arch=x64 --build-from-source
-
-# Build Electron Windows 32bit
-node_modules\.bin\node-pre-gyp.cmd configure --target=$version --arch=ia32 --dist-url=https://electronjs.org/headers --module_name=node_printer
-node_modules\.bin\node-pre-gyp.cmd build package --runtime=electron --target=$version --target_arch=ia32 --build-from-source

package/tools/buildWindows.ps1

@@ -1,23 +0,0 @@
-# Build Win32 64bit
-# node_modules\.bin\node-pre-gyp.cmd configure --target=$env:nodejs_version
-# node_modules\.bin\node-pre-gyp.cmd build package --target=$env:nodejs_version --target_arch=x64
-
-# Build Win32 32bit
-# node_modules\.bin\node-pre-gyp.cmd configure --target=$env:nodejs_version
-# node_modules\.bin\node-pre-gyp.cmd build package --target=$env:nodejs_version --target_arch=ia32
-
-if ($env:build_electron -ne "true") {
-  echo "Skipping Electron Build as flag not set"
-  return
-}
-
-# Build Electron Versions
-./tools/buildElectronWindows.ps1 1.2.8
-./tools/buildElectronWindows.ps1 1.3.8
-./tools/buildElectronWindows.ps1 1.4.6
-./tools/buildElectronWindows.ps1 1.7.12
-./tools/buildElectronWindows.ps1 2.0.18
-./tools/buildElectronWindows.ps1 3.1.13
-./tools/buildElectronWindows.ps1 4.2.10
-./tools/buildElectronWindows.ps1 5.0.10
-./tools/buildElectronWindows.ps1 6.0.7

package/tools/generateReleaseBuildsLinux.sh

@@ -1,59 +0,0 @@
-#!/bin/bash
-
-RELEASE_VERSION=$1
-PACKAGE_VERSION=$(node -pe "require('./package.json').version")
-SOURCE_PATH="${BASH_SOURCE%/*}/.."
-
-declare -a node_versions=(
-  "0.10.48"
-  "0.12.18"
-  "4.9.1"
-  "5.9.1"
-  "6.17.1"
-  "8.16.1"
-  "10.16.0"
-  "11.15.0"
-  "12.10.0"
-)
-
-declare -a electron_versions=(
-  "1.2.8"
-  "1.3.8"
-  "1.4.6"
-  "1.7.12"
-  "2.0.18"
-  "3.1.13"
-  "4.2.10"
-  "5.0.10"
-  "6.0.7"
-)
-
-# remove old build directory
-rm -rf "$SOURCHE_PATH/build" > /dev/null
-
-# create release path
-mkdir -p "$SOURCE_PATH/releases/$RELEASE_VERSION" > /dev/null
-
-for version in "${node_versions[@]}"
-do
-  echo "Building for node version: $version..."
-  node-pre-gyp configure --target=$version --module_name=node_printer --silent
-  node-pre-gyp build package --target=$version --target_arch=x64 --build-from-source --silent
-  node-pre-gyp configure --target=$version --module_name=node_printer --silent
-  node-pre-gyp build package --target=$version --target_arch=ia32 --build-from-source --silent
-  rsync -a -v "$SOURCE_PATH/build/stage/$PACKAGE_VERSION/" "$SOURCE_PATH/releases/$RELEASE_VERSION/" --remove-source-files > /dev/null
-  echo "Done"
-done
-
-for version in "${electron_versions[@]}"
-do
-  echo "Building for electron version: $version..."
-  node-pre-gyp configure --target=$version --dist-url=https://electronjs.org/headers --module_name=node_printer --silent
-  node-pre-gyp build package --target=$version --target_arch=x64 --runtime=electron --build-from-source --silent
-  node-pre-gyp configure --target=$version --dist-url=https://electronjs.org/headers --module_name=node_printer --silent
-  node-pre-gyp build package --target=$version --target_arch=ia32 --runtime=electron --build-from-source --silent
-  rsync -a -v "$SOURCE_PATH/build/stage/$PACKAGE_VERSION/" "$SOURCE_PATH/releases/$RELEASE_VERSION/" --remove-source-files > /dev/null
-  echo "Done"
-done
-
-echo "Finished succesfully!"

package/tools/generateReleaseBuildsWindows.ps1

@@ -1,63 +0,0 @@
-param (
-  [Parameter(Mandatory=$true)][string]$release
-)
-
-$SOURCE_PATH = split-path -parent $MyInvocation.MyCommand.Definition
-$RELEASE_VERSION = $release
-$PACKAGE_VERSION = node -pe "require('./package.json').version"
-
-echo $SOURCE_PATH
-
-$node_versions = @(
-  "0.10.48",
-  "0.12.18",
-  "4.9.1",
-  "5.9.1",
-  "6.17.1",
-  "8.16.1",
-  "10.16.0",
-  "11.15.0",
-  "12.10.0"
-)
-
-$electron_versions = @(
-  "1.2.8",
-  "1.3.8",
-  "1.4.6",
-  "1.7.12",
-  "2.0.18",
-  "3.1.13",
-  "4.2.10",
-  "5.0.10",
-  "6.0.7"
-)
-
-# remove old build directory
-Remove-Item -Recurse -Force $SOURCE_PATH'\..\build' -ErrorAction Ignore | Out-Null
-
-# create release path
-New-Item $SOURCE_PATH'\..\releases\'$RELEASE_VERSION -ItemType Directory -ea 0 | Out-Null
-
-foreach ($version in $node_versions) {
-  Write-Output "Building for node version: $version..."
-  node-pre-gyp configure --target=$version --module_name=node_printer --silent | Out-Null
-  node-pre-gyp build package --target=$version --target_arch=x64 --build-from-source --silent | Out-Null
-  node-pre-gyp configure --target=$version --module_name=node_printer --silent | Out-Null
-  node-pre-gyp build package --target=$version --target_arch=ia32 --build-from-source --silent | Out-Null
-  Copy-item -Force -Recurse $SOURCE_PATH'\..\build\stage\'$PACKAGE_VERSION\* -Destination $SOURCE_PATH'\..\releases\'$RELEASE_VERSION -ErrorAction Ignore | Out-Null
-  Remove-Item -Recurse -Force $SOURCE_PATH'\..\build\stage' | Out-Null
-  Write-Output "Done"
-}
-
-foreach ($version in $electron_versions) {
-  Write-Output "Building for electron version: $version..."
-  node-pre-gyp configure --target=$version --dist-url=https://electronjs.org/headers --module_name=node_printer --silent | Out-Null
-  node-pre-gyp build package --target=$version --target_arch=x64 --runtime=electron --build-from-source --silent | Out-Null
-  node-pre-gyp configure --target=$version --dist-url=https://electronjs.org/headers --module_name=node_printer --silent | Out-Null
-  node-pre-gyp build package --target=$version --target_arch=ia32 --runtime=electron --build-from-source --silent | Out-Null
-  Copy-item -Force -Recurse $SOURCE_PATH'\..\build\stage\'$PACKAGE_VERSION\* -Destination $SOURCE_PATH'\..\releases\'$RELEASE_VERSION -ErrorAction Ignore | Out-Null
-  Remove-Item -Recurse -Force $SOURCE_PATH'\..\build\stage' | Out-Null
-  Write-Output "Done"
-}
-
-Write-Output "Finished succesfully!"