node-atol-wrapper 0.0.26 → 0.0.27

package/.github/workflows/nodejs.yml

@@ -7,24 +7,48 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     strategy:
+      fail-fast: false
       matrix:
-        os: [windows-2019, ubuntu-latest, macos-latest]
-        node-version: [12, 14, 16, 18]
+        os: [windows-2022, ubuntu-latest, macos-13]
+        node-version: [16, 18, 20, 22]
+        exclude:
+          # Exclude Node 22 on macOS 13 due to compatibility issues
+          - os: macos-13
+            node-version: 22
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - if: matrix.os == 'windows-2019'
-        name: Choco install
-        uses: crazy-max/ghaction-chocolatey@v2
+        uses: actions/checkout@v4
+      - if: matrix.os == 'windows-2022'
+        name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+      - if: matrix.os == 'windows-2022'
+        name: Setup Windows SDK
+        uses: GuillaumeFalourd/setup-windows10-sdk-action@v1.11
         with:
-          args: install visualcpp-build-tools -y
+          sdk-version: 20348
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
+      - name: Setup Python for macOS
+        if: matrix.os == 'macos-13'
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Install setuptools for macOS
+        if: matrix.os == 'macos-13'
+        run: |
+          python -m pip install --upgrade pip setuptools
+      - name: Configure npm for native modules
+        if: matrix.os == 'macos-13'
+        run: |
+          echo "CC=clang" >> $GITHUB_ENV
+          echo "CXX=clang++" >> $GITHUB_ENV
+          echo "PYTHON=$(which python)" >> $GITHUB_ENV
       - name: npm install, build
         run: |
           npm install --build-from-source
         env:
           CI: true
+          npm_config_build_from_source: true

package/README.md

@@ -2,7 +2,7 @@
 
 Название
 =========
-Node.js обертка для драйвера торгового оборудования (ДТО) версии `10.10.6.0` от компании [АТОЛ](https://www.atol.ru/)
+Node.js обертка для драйвера торгового оборудования (ДТО) версии `10.10.7.0` от компании [АТОЛ](https://www.atol.ru/)
 
 [ Источник ](https://forum.atol.ru/lofiversion/index.php/t34345.html)
 

package/binding.gyp

@@ -62,8 +62,12 @@
                  ]
                }],
                ["OS=='mac'", {
-                 'files': [
-                   "<(module_root_dir)/src/macos-x86_64/fptr10.framework"
+                 'conditions': [
+                   ["target_arch=='x64'", {
+                     'files': [
+                       "<(module_root_dir)/src/macos-x86_64/fptr10.framework"
+                     ]
+                   }]
                  ]
                }],
              ],
@@ -100,10 +104,22 @@
       	["OS=='mac'", {
           "link_settings": {
             "libraries": [
-              "<(module_root_dir)/build/Release/fptr10.framework/Versions/A/fptr10",
-              "-Wl,-rpath,@loader_path",
+              "<(module_root_dir)/build/Release/fptr10.framework/Versions/A/fptr10"
             ],
+            "ldflags": [
+              "-Wl,-rpath,@loader_path"
+            ]
           },
+          "xcode_settings": {
+            "OTHER_CPLUSPLUSFLAGS": [
+              "-std=c++17",
+              "-stdlib=libc++"
+            ],
+            "OTHER_LDFLAGS": [
+              "-stdlib=libc++"
+            ],
+            "MACOSX_DEPLOYMENT_TARGET": "10.15"
+          }
         }]
       ],
       "dependencies" : [ "copy_fptr_libs" ],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-atol-wrapper",
   "description": "Node ATOL DTO 10 wrapper",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "main": "bindings.js",
   "types": "bindings.d.ts",
   "scripts": {
@@ -10,8 +10,8 @@
     "start": "node ./index.js"
   },
   "dependencies": {
-    "nan": "^2.14.2",
-    "@mapbox/node-pre-gyp": "^1.0.9"
+    "nan": "^2.20.0",
+    "@mapbox/node-pre-gyp": "^1.0.11"
   },
   "devDependencies": {},
   "binary": {
@@ -20,7 +20,7 @@
     "host": "https://your_module.s3-us-west-1.amazonaws.com"
   },
   "engines": {
-    "node": ">= 4.0.0"
+    "node": ">= 16.0.0"
   },
   "homepage": "https://github.com/farafonov-alexey/node-atol-wrapper",
   "keywords": [

package/src/libfptr10.h

@@ -322,6 +322,7 @@ enum libfptr_error
     LIBFPTR_ERROR_MINIPOS_NO_FILE_ON_USB_STORE,
     LIBFPTR_ERROR_MINIPOS_NO_AGENT_FISCAL_PROPERTY,
     LIBFPTR_ERROR_NO_CONNECTION_WITH_PRINT_SERVICE,
+    LIBFPTR_ERROR_UNIVERSAL_COUNTERS_ARE_DISABLED,
 
     LIBFPTR_ERROR_BASE_MARKING = 400,
     LIBFPTR_ERROR_MARKING_CODE_VALIDATION_IN_PROGRESS,
@@ -770,6 +771,14 @@ enum libfptr_param
     LIBFPTR_PARAM_MARKING_NOT_FORM_REQUEST,
     LIBFPTR_PARAM_PRINT_ENTITY_TYPE,
     LIBFPTR_PARAM_RECEIPT_TAPE_PATH_LENGTH,
+    LIBFPTR_PARAM_LICENSE_INDEX,
+    LIBFPTR_PARAM_IS_LICENSE_VALID,
+    LIBFPTR_PARAM_RECEIPT_PERCENTAGE_SIZE,
+    LIBFPTR_PARAM_ADDITIONAL_ATTRIBUTE,
+    LIBFPTR_PARAM_ADDITIONAL_DATA,
+    LIBFPTR_PARAM_ELECTRONICALLY_PAYMENT_METHOD,
+    LIBFPTR_PARAM_ELECTRONICALLY_ID,
+    LIBFPTR_PARAM_ELECTRONICALLY_ADD_INFO,
 
     // certification
     LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME,
@@ -807,11 +816,12 @@ enum libfptr_model
     LIBFPTR_MODEL_ATOL_PT_5F = 89,
     LIBFPTR_MODEL_KAZNACHEY_FA = 76,
     LIBFPTR_MODEL_ATOL_1F = 93,
+    LIBFPTR_MODEL_ATOL_2F = 96,
     LIBFPTR_MODEL_ATOL_22v2F = 95,
     LIBFPTR_MODEL_ATOL_42FA = 70,
     LIBFPTR_MODEL_ALLIANCE_20F = 50,
     LIBFPTR_MODEL_ATOL_STB_6F = 94,
-    LIBFPTR_MODEL_ATOL_35F = 97,
+    LIBFPTR_MODEL_ATOL_35F = 97,    
     // certification
     LIBFPTR_MODEL_ATOL_27_FP7_F = 99,
 };
@@ -886,6 +896,10 @@ enum libfptr_model
 
 #define LIBFPTR_SETTING_LICENSE L"Licenses"
 
+#define LIBFPTR_SETTING_TIME_ZONE L"TimeZone"
+
+#define LIBFPTR_SETTING_REMOTE_TIMEOUT L"RemoteTimeout"
+
 enum libfptr_port
 {
     LIBFPTR_PORT_COM = 0,
@@ -1077,7 +1091,8 @@ enum libfptr_payment_type
     LIBFPTR_PT_7,
     LIBFPTR_PT_8,
     LIBFPTR_PT_9,
-    LIBFPTR_PT_10
+    LIBFPTR_PT_10,
+    LIBFPTR_PT_ADD_INFO
 };
 
 enum libfptr_tax_type
@@ -1091,11 +1106,11 @@ enum libfptr_tax_type
     LIBFPTR_TAX_NO,
     LIBFPTR_TAX_VAT20,
     LIBFPTR_TAX_VAT120,
-    LIBFPTR_TAX_INVALID,
     LIBFPTR_TAX_VAT5,
-    LIBFPTR_TAX_VAT105,
     LIBFPTR_TAX_VAT7,
-    LIBFPTR_TAX_VAT107
+    LIBFPTR_TAX_VAT105,
+    LIBFPTR_TAX_VAT107,
+    LIBFPTR_TAX_INVALID,
 };
 
 enum libfptr_external_device_type
@@ -1195,6 +1210,7 @@ enum libfptr_fn_data_type
     LIBFPTR_FNDT_MARKING_MODE_STATUS,
     LIBFPTR_FNDT_CHECK_MARK_TIME,
     LIBFPTR_FNDT_RECEIPT_SIZE,
+    LIBFPTR_FNDT_NOTIFICATION_STATUS,
 
     // certification
     LIBFPTR_FNDT_FNM_KEYS_UPDATE_DATE_TIME
@@ -1419,6 +1435,8 @@ enum libfptr_marking_estimated_status
     LIBFPTR_MES_DRY_FOR_SALE,
     LIBFPTR_MES_PIECE_RETURN,
     LIBFPTR_MES_DRY_RETURN,
+    LIBFPTR_MES_PIECE_FOR_SALE,
+    LIBFPTR_MES_DRY_SOLD,
     LIBFPTR_MES_UNCHANGED = 255
 };
 
@@ -1614,6 +1632,23 @@ enum libfptr_print_entity_type
     LIBFPTR_PET_FISCAL_DOCUMENT,
 };
 
+enum libfptr_time_zone
+{
+    LIBFPTR_TIME_ZONE_NO = -1,
+    LIBFPTR_TIME_ZONE_DEVICE = 0,
+    LIBFPTR_TIME_ZONE_1 = 1,
+    LIBFPTR_TIME_ZONE_2,
+    LIBFPTR_TIME_ZONE_3,
+    LIBFPTR_TIME_ZONE_4,
+    LIBFPTR_TIME_ZONE_5,
+    LIBFPTR_TIME_ZONE_6,
+    LIBFPTR_TIME_ZONE_7,
+    LIBFPTR_TIME_ZONE_8,
+    LIBFPTR_TIME_ZONE_9,
+    LIBFPTR_TIME_ZONE_10,
+    LIBFPTR_TIME_ZONE_11,
+};
+
 #define LIBFPTR_UC_OTHERS 4294967295
 
 

package/src/macos-x86_64/fptr10.framework/Versions/A/Headers/libfptr10.h

@@ -774,6 +774,11 @@ enum libfptr_param
     LIBFPTR_PARAM_LICENSE_INDEX,
     LIBFPTR_PARAM_IS_LICENSE_VALID,
     LIBFPTR_PARAM_RECEIPT_PERCENTAGE_SIZE,
+    LIBFPTR_PARAM_ADDITIONAL_ATTRIBUTE,
+    LIBFPTR_PARAM_ADDITIONAL_DATA,
+    LIBFPTR_PARAM_ELECTRONICALLY_PAYMENT_METHOD,
+    LIBFPTR_PARAM_ELECTRONICALLY_ID,
+    LIBFPTR_PARAM_ELECTRONICALLY_ADD_INFO,
 
     // certification
     LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME,
@@ -811,11 +816,12 @@ enum libfptr_model
     LIBFPTR_MODEL_ATOL_PT_5F = 89,
     LIBFPTR_MODEL_KAZNACHEY_FA = 76,
     LIBFPTR_MODEL_ATOL_1F = 93,
+    LIBFPTR_MODEL_ATOL_2F = 96,
     LIBFPTR_MODEL_ATOL_22v2F = 95,
     LIBFPTR_MODEL_ATOL_42FA = 70,
     LIBFPTR_MODEL_ALLIANCE_20F = 50,
     LIBFPTR_MODEL_ATOL_STB_6F = 94,
-    LIBFPTR_MODEL_ATOL_35F = 97,
+    LIBFPTR_MODEL_ATOL_35F = 97,    
     // certification
     LIBFPTR_MODEL_ATOL_27_FP7_F = 99,
 };
@@ -890,6 +896,10 @@ enum libfptr_model
 
 #define LIBFPTR_SETTING_LICENSE L"Licenses"
 
+#define LIBFPTR_SETTING_TIME_ZONE L"TimeZone"
+
+#define LIBFPTR_SETTING_REMOTE_TIMEOUT L"RemoteTimeout"
+
 enum libfptr_port
 {
     LIBFPTR_PORT_COM = 0,
@@ -1081,7 +1091,8 @@ enum libfptr_payment_type
     LIBFPTR_PT_7,
     LIBFPTR_PT_8,
     LIBFPTR_PT_9,
-    LIBFPTR_PT_10
+    LIBFPTR_PT_10,
+    LIBFPTR_PT_ADD_INFO
 };
 
 enum libfptr_tax_type
@@ -1424,6 +1435,8 @@ enum libfptr_marking_estimated_status
     LIBFPTR_MES_DRY_FOR_SALE,
     LIBFPTR_MES_PIECE_RETURN,
     LIBFPTR_MES_DRY_RETURN,
+    LIBFPTR_MES_PIECE_FOR_SALE,
+    LIBFPTR_MES_DRY_SOLD,
     LIBFPTR_MES_UNCHANGED = 255
 };
 
@@ -1619,6 +1632,23 @@ enum libfptr_print_entity_type
     LIBFPTR_PET_FISCAL_DOCUMENT,
 };
 
+enum libfptr_time_zone
+{
+    LIBFPTR_TIME_ZONE_NO = -1,
+    LIBFPTR_TIME_ZONE_DEVICE = 0,
+    LIBFPTR_TIME_ZONE_1 = 1,
+    LIBFPTR_TIME_ZONE_2,
+    LIBFPTR_TIME_ZONE_3,
+    LIBFPTR_TIME_ZONE_4,
+    LIBFPTR_TIME_ZONE_5,
+    LIBFPTR_TIME_ZONE_6,
+    LIBFPTR_TIME_ZONE_7,
+    LIBFPTR_TIME_ZONE_8,
+    LIBFPTR_TIME_ZONE_9,
+    LIBFPTR_TIME_ZONE_10,
+    LIBFPTR_TIME_ZONE_11,
+};
+
 #define LIBFPTR_UC_OTHERS 4294967295
 
 

package/src/macos-x86_64/fptr10.framework/Versions/A/Headers/libfptr10_objc.h

@@ -35,6 +35,8 @@
 #define LIBFPTR_SETTING_AUTO_TIME_SYNC @"AutoTimeSync"
 #define LIBFPTR_SETTING_AUTO_TIME_SYNC_TIME @"AutoTimeSyncTime"
 #define LIBFPTR_SETTING_MERGE_RECEIPT_ITEMS @"MergeReceiptItems"
+#define LIBFPTR_SETTING_TIME_ZONE @"TimeZone"
+#define LIBFPTR_SETTING_REMOTE_TIMEOUT @"RemoteTimeout"
 #define LIBFPTR_MODEL_UNKNOWN 0
 #define LIBFPTR_MODEL_ATOL_25F 57
 #define LIBFPTR_MODEL_ATOL_30F 61
@@ -67,6 +69,7 @@
 #define LIBFPTR_MODEL_ATOL_55V2F 66
 #define LIBFPTR_MODEL_ATOL_STB_6F 92
 #define LIBFPTR_MODEL_ATOL_35F 97
+#define LIBFPTR_MODEL_ATOL_2F 96
 #define LIBFPTR_PORT_BR_1200 1200
 #define LIBFPTR_PORT_BR_2400 2400
 #define LIBFPTR_PORT_BR_4800 4800
@@ -581,9 +584,14 @@ enum libfptr_param
     LIBFPTR_PARAM_LICENSE_INDEX = 65933,
     LIBFPTR_PARAM_IS_LICENSE_VALID = 65934,
     LIBFPTR_PARAM_RECEIPT_PERCENTAGE_SIZE = 65935,
-    LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME = 65936,
-    LIBFPTR_PARAM_LAST_ATTEMPTION_FNM_UPDATE_KEYS_DATE_TIME = 65937,
-    LIBFPTR_PARAM_COUNT_ATTEMPTION_FNM_UPDATE_KEYS = 65938,
+    LIBFPTR_PARAM_ADDITIONAL_ATTRIBUTE = 65936,
+    LIBFPTR_PARAM_ADDITIONAL_DATA = 65937,
+    LIBFPTR_PARAM_ELECTRONICALLY_PAYMENT_METHOD = 65938,
+    LIBFPTR_PARAM_ELECTRONICALLY_ID = 65939,
+    LIBFPTR_PARAM_ELECTRONICALLY_ADD_INFO = 65940,
+    LIBFPTR_PARAM_LAST_SUCCESS_FNM_UPDATE_KEYS_DATE_TIME = 65941,
+    LIBFPTR_PARAM_LAST_ATTEMPTION_FNM_UPDATE_KEYS_DATE_TIME = 65942,
+    LIBFPTR_PARAM_COUNT_ATTEMPTION_FNM_UPDATE_KEYS = 65943,
 };
 
 enum libfptr_error
@@ -1065,6 +1073,7 @@ enum libfptr_payment_type
     LIBFPTR_PT_8 = 7,
     LIBFPTR_PT_9 = 8,
     LIBFPTR_PT_10 = 9,
+    LIBFPTR_PT_ADD_INFO = 10,
 };
 
 enum libfptr_tax_type
@@ -1354,6 +1363,8 @@ enum libfptr_marking_estimated_status
     LIBFPTR_MES_DRY_FOR_SALE = 2,
     LIBFPTR_MES_PIECE_RETURN = 3,
     LIBFPTR_MES_DRY_RETURN = 4,
+    LIBFPTR_MES_PIECE_FOR_SALE = 5,
+    LIBFPTR_MES_DRY_SOLD = 6,
 };
 
 enum libfptr_marking_mode_checking_status
@@ -1477,6 +1488,22 @@ enum libfptr_license
     LIBFPTR_LIC_EXT_FISCAL = 18,
 };
 
+enum libfptr_time_zone
+{
+    LIBFPTR_TIME_ZONE_DEVICE = 0,
+    LIBFPTR_TIME_ZONE_1 = 1,
+    LIBFPTR_TIME_ZONE_2 = 2,
+    LIBFPTR_TIME_ZONE_3 = 3,
+    LIBFPTR_TIME_ZONE_4 = 4,
+    LIBFPTR_TIME_ZONE_5 = 5,
+    LIBFPTR_TIME_ZONE_6 = 6,
+    LIBFPTR_TIME_ZONE_7 = 7,
+    LIBFPTR_TIME_ZONE_8 = 8,
+    LIBFPTR_TIME_ZONE_9 = 9,
+    LIBFPTR_TIME_ZONE_10 = 10,
+    LIBFPTR_TIME_ZONE_11 = 11,
+};
+
 enum libfptr_rpc_server_error
 {
     LIBFPTR_ERROR_BASE_RPC = 600,

package/src/macos-x86_64/fptr10.framework/Versions/A/Resources/Info.plist

@@ -24,10 +24,10 @@
 	<string>FMWK</string>
 
 	<key>CFBundleVersion</key>
-	<string>10.10.6.0</string>
+	<string>10.10.7.0</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>10.10.6</string>
+	<string>10.10.7</string>
 
 	<key>CSResourcesFileMapped</key>
 	<true/>