sip-lab 1.12.24 → 1.12.26

package/README.md

@@ -18,6 +18,9 @@ TODO:
 
 ### Installation
 
+This is an node.js addon and it is known to work on Ubuntu 18.04, Ubuntu 20.04, Debian 10 and Debian 11 (it is known to not work on Debian 8 unless you build the addon yourself).
+It is discributed with prebuild binaries for node.js 15.0.0 and above (it is possible to use older versions of node but you will need to build the addon yourself).
+
 This will require you to have some libraries installed. So do:
 ```
 apt install build-essential automake autoconf libtool libspeex-dev libopus-dev libsdl2-dev libavdevice-dev libswscale-dev libv4l-dev libopencore-amrnb-dev libopencore-amrwb-dev libvo-amrwbenc-dev libopus-dev libsdl2-dev libopencore-amrnb-dev libopencore-amrwb-dev libvo-amrwbenc-dev libboost-dev libtiff-dev libpcap-dev libssl-dev uuid-dev
@@ -28,23 +31,12 @@ Then install sip-lab by doing:
 npm install sip-lab
 ```
 
-Be patient because we will need to download pjproject and build it.
-
-We will also download and build spandsp, bcg729 and rapidjson.
-
-However since it takes several minutes to build this module, you can install it globally:
+To test from within this repo you will need to download and build dependencies. Do:
 ```
-npm install -g sip-lab
+./build_deps.sh
 ```
-
-But if you do so, you will need to set NODE_PATH for node to find it by doing:
-```
-  export NODE_PATH=$(npm root --quiet -g)
+Then build the node addon by doing:
 ```
-
-To test from within this repo just build and install by doing:
-```
-  npm install -g node-gyp
   npm install
 ```
 And run some sample script from subfolder samples:
@@ -54,13 +46,6 @@ And run some sample script from subfolder samples:
 The above script has detailed comments. 
 Please read it to undestand how to write your own test scripts.
 
-The module is known to work properly in Ubuntu 18.04.4, Ubuntu 20.04.4, Debian 8 and Debian 10 (and it is expected to work in Debian 9).
-
-It was originally developed with node v.10 and tested with v.12 and v16.13.1 and it is expected to work with latest versions of node.
-
-(it is known to not work with node v.8)
-
-
 ### About the code
 
 Although the code in written in *.cpp/*.hpp named files, this is not actually a C++ project.

package/{install.sh → build_deps.sh}

@@ -69,9 +69,4 @@ EOF
 fi
 
 
-
-cd $START_DIR
-
-node-gyp configure
-
-node-gyp build
+echo "Build of dependencies successful"

package/index.js

@@ -1,4 +1,4 @@
-const addon = require('./build/Release/addon.node');
+const addon = require('node-gyp-build')(__dirname);
 
 var events = require('events');
 var eventEmitter = new events.EventEmitter();

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "sip-lab",
-  "version": "1.12.24",
+  "version": "1.12.26",
   "description": "",
   "main": "index.js",
   "engines": {
     "node": ">=10.22"
   },
   "scripts": {
-    "install": "./install.sh",
+    "install": "node-gyp-build",
     "test": "./runtests"
   },
   "repository": {
@@ -19,9 +19,20 @@
   "gypfile": true,
   "homepage": "https://github.com/MayamaTakeshi/sip-lab",
   "dependencies": {
-    "node-addon-api": "^1.7.2",
-    "node-gyp": "^8.4.1",
     "@mayama/zeq": "^4.1.14",
+    "node-addon-api": "^5.0.0",
+    "node-gyp": "^9.1.0",
+    "node-gyp-build": "^4.5.0",
     "sip-matching": "^1.3.32"
-  }
+  },
+  "devDependencies": {
+    "prebuildify": "^5.0.1"
+  },
+  "files": [
+    "index.js",
+    "bindings.gyp",
+    "build_deps.sh",
+    "samples",
+    "prebuilds"
+  ]
 }

package/DEV.md

@@ -1,35 +0,0 @@
-### For devs
-
-We build and statically link to libs pjproject, spandsp, bgc729 and rapidjson.
-
-Basic tasks for development:
-
-#### To build
-```
-npm install
-```
-
-#### To clean up (for a clean rebuild)
-```
-npx node-gyp clean
-```
-
-#### To update pjproject, spandsp, bcg729 or rapidjson
-Just delete the corresponding library subfolder in subfolder 3drParty.
-
-
-Then temporarily change install.sh to not checkout a specific version (or checkout a desired commit)
-
-Then run
-```
-npm install
-```
-
-Then perform code changes and tests. When you are satisfied with them, update install.sh with the new commit id.
-
-
-#### Running tests
-```
-npm test
-```
-

package/binding.gyp

@@ -1,110 +0,0 @@
-{
-  'targets': [
-    {
-      'target_name': 'addon',
-      'sources': [
-        'src/log.cpp',
-        'src/event_templates.cpp',
-        'src/idmanager.cpp',
-        'src/packetdumper.cpp',
-        'src/sip.cpp',
-        'src/addon.cpp',
-        'src/pjmedia/src/chainlink/chainlink_dtmfdet.c',
-        'src/pjmedia/src/chainlink/chainlink_tonegen.c',
-        'src/pjmedia/src/chainlink/chainlink_wav_player.c',
-        'src/pjmedia/src/chainlink/chainlink_wav_writer.c',
-        'src/pjmedia/src/chainlink/chainlink_wire_port.c',
-        'src/pjmedia/src/chainlink/chainlink_fax.c',
-      ],
-      'include_dirs': [
-        "3rdParty/pjproject/pjsip/include",
-        "3rdParty/pjproject/pjlib/include",
-        "3rdParty/pjproject/pjlib-util/include",
-        "3rdParty/pjproject/pjnath/include",
-        "3rdParty/pjproject/pjmedia/include",
-        "include",
-        "src",
-        "src/pjmedia/include",
-        "src/pjmedia/include/pjmedia",
-        "src/pjmedia/include/chainlink",	
-        "3rdParty/rapidjson/include",
-        "3rdParty/spandsp/src",
-        "<!@(node -p \"require('node-addon-api').include\")",
-      ],
-      "dependencies": [
-        "<!@(node -p \"require('node-addon-api').gyp\")"
-      ],
-      'conditions': [
-        [ 'OS!="win"', {
-          'cflags_cc': [
-			'-g',
-            '-fexceptions',
-            '-Wno-maybe-uninitialized',
-            '-fPIC',
-          ],
-          'ldflags_cc': [
-            '-all-static',
-          ]
-          }
-        ]
-      ],
-      'link_settings': {
-          'libraries': [
-            '-L ../3rdParty/pjproject/pjnath/lib',
-            '-L ../3rdParty/pjproject/pjlib/lib',
-            '-L ../3rdParty/pjproject/pjlib-util/lib',
-            '-L ../3rdParty/pjproject/third_party/lib',
-            '-L ../3rdParty/pjproject/pjmedia/lib',
-            '-L ../3rdParty/pjproject/pjsip/lib',
-            '-L ../3rdParty/pjproject/third_party/lib',
-            '-l pjnath-x86_64-unknown-linux-gnu',
-            '-l ilbccodec-x86_64-unknown-linux-gnu',
-            '-l srtp-x86_64-unknown-linux-gnu',
-            '-l webrtc-x86_64-unknown-linux-gnu',
-            '-l yuv-x86_64-unknown-linux-gnu',
-            '-l speex-x86_64-unknown-linux-gnu',
-            '-l gsmcodec-x86_64-unknown-linux-gnu',
-            '-l g7221codec-x86_64-unknown-linux-gnu',
-            '-l resample-x86_64-unknown-linux-gnu',
-            '-l pjmedia-audiodev-x86_64-unknown-linux-gnu',
-            '-l pjmedia-codec-x86_64-unknown-linux-gnu',
-            '-l pjmedia-videodev-x86_64-unknown-linux-gnu',
-            '-l pjmedia-x86_64-unknown-linux-gnu',
-            '-l pjsdp-x86_64-unknown-linux-gnu',
-            '-l pjsip-x86_64-unknown-linux-gnu',
-            '-l pjsua2-x86_64-unknown-linux-gnu',
-            '-l pjsip-ua-x86_64-unknown-linux-gnu',
-            '-l pjsip-simple-x86_64-unknown-linux-gnu',
-            '-l pjsua-x86_64-unknown-linux-gnu',
-            '-l pj-x86_64-unknown-linux-gnu',
-            '-l pjlib-util-x86_64-unknown-linux-gnu',
-            '../3rdParty/spandsp/src/.libs/libspandsp.a',
-            '../3rdParty/bcg729/src/libbcg729.a',
-            '-lstdc++',
-            '-lopus',
-            '-lssl',
-            '-lcrypto',
-            '-luuid',
-            '-lm',
-            '-ldl',
-            '-ltiff',
-            '-lpcap',
-            '-lrt',
-            '-lpthread',
-            '-lasound',
-            '-lSDL2',
-            '-lavdevice',
-            '-lavformat',
-            '-lavcodec',
-            '-lswscale',
-            '-lavutil',
-            '-lv4l2',
-            '-lopencore-amrnb',
-            '-lopencore-amrwb',
-            '-lvo-amrwbenc',
-            '-lspeex',
-          ],
-      },
-    },
-  ]
-}