@babblevoice/babble-drachtio-callmanager 3.7.31 → 3.8.1

package/.dockerignore

@@ -0,0 +1,6 @@
+node_modules
+.git
+.github
+*.md
+Dockerfile
+.dockerignore

package/Dockerfile

@@ -0,0 +1,52 @@
+# babble-drachtio-callmanager test image
+#
+# callmanager talks to projectrtp as a client, but its interface tests boot a
+# real local engine (projectrtp.run()). @babblevoice/projectrtp 3.x is a Rust
+# napi addon shipped as source (rust/ + libilbc/) with no install hook, so we
+# compile it in a rust-builder stage and drop the resulting .so into
+# node_modules/@babblevoice/projectrtp/build/Release/ — then run the suite
+# against the real engine (no mocking). Mirrors babble-rtp's Dockerfile.
+#
+#   docker build --target test -t callmanager:test .
+#   docker run --rm callmanager:test
+#   docker run --rm callmanager:test npx mocha --recursive --check-leaks --grep '486'
+
+# --- Stage 1: install node deps (incl. dev deps for the test run) -----------
+FROM alpine:3.22 AS deps
+WORKDIR /usr/src/callmanager/
+RUN apk add --no-cache nodejs npm
+COPY package.json package-lock.json ./
+# --ignore-scripts: projectrtp 3.x has no install hook; we build the Rust
+# addon ourselves in the next stage.
+RUN npm ci --ignore-scripts
+
+# --- Stage 2: build the Rust napi cdylib + libilbc --------------------------
+# Pinned to rust 1.92 to match projectrtp's own build.
+FROM rust:1.92-alpine3.22 AS rust-builder
+WORKDIR /src
+RUN apk add --no-cache musl-dev pkgconfig cmake build-base linux-headers spandsp3-dev
+COPY --from=deps /usr/src/callmanager/node_modules/@babblevoice/projectrtp/libilbc/ /src/libilbc/
+RUN mkdir -p /src/libilbc/_build && \
+    cd /src/libilbc/_build && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
+    make -j"$(nproc)" && make install && \
+    ldconfig /usr/local/lib 2>/dev/null || true
+COPY --from=deps /usr/src/callmanager/node_modules/@babblevoice/projectrtp/rust/ /src/rust/
+WORKDIR /src/rust
+# Alpine's rust defaults to musl with +crt-static; a cdylib loaded by Node at
+# runtime needs dynamic linkage, so override.
+ENV RUSTFLAGS="-C target-feature=-crt-static"
+RUN cargo build --release
+
+# --- Stage 3: test image ----------------------------------------------------
+FROM alpine:3.22 AS test
+WORKDIR /usr/src/callmanager/
+RUN apk add --no-cache nodejs npm spandsp3 libstdc++ libc6-compat ca-certificates
+COPY --from=deps /usr/src/callmanager/node_modules ./node_modules
+COPY --from=rust-builder /usr/local/lib/libilbc.so* /usr/lib/
+COPY --from=rust-builder /src/rust/target/release/libprojectrtp.so \
+     ./node_modules/@babblevoice/projectrtp/build/Release/projectrtp.node
+COPY package.json package-lock.json index.js ./
+COPY lib/ ./lib/
+COPY test/ ./test/
+CMD [ "npm", "test" ]

package/README.md

@@ -162,28 +162,48 @@ npm link projectrtp
 npm link babble-drachtio-registrar
 npm link babble-drachtio-auth
 
-If you want to test then projectrtp needs to be able to build locally, this uses the latest projectrtp docker image.
+# Building and testing
+
+The interface tests boot a **real** projectrtp engine (`projectrtp.run()`) rather
+than mocking it. `@babblevoice/projectrtp` 3.x is a Rust napi addon published as
+source (`rust/` + `libilbc/`) with no install hook, so the native `.so` has to be
+compiled and dropped into `node_modules/@babblevoice/projectrtp/build/Release/projectrtp.node`
+before the suite can run. The `Dockerfile` does this in a `rust-builder` stage
+(mirroring babble-rtp) so you don't need a local Rust/cmake toolchain.
+
+Run the whole suite:
 
 ```bash
-docker run --rm -it \
-  -e HOME=/usr/src/app \
-  -v "$(pwd)":/usr/src/app:Z \
-  -w /usr/src/app \
-  tinpotnick/projectrtp \
-  npm test
+docker build --target test -t callmanager:test .
+docker run --rm callmanager:test
+```
+
+Run a single test (override the default `npm test` command):
 
+```bash
+docker run --rm callmanager:test \
+  npx mocha --recursive --check-leaks --grep 'Create call and send 183 - early - SAVPF'
 ```
 
-or for a specific test
+To iterate on test code without rebuilding the image each time, mount your working
+tree over the source (the built engine in the image's `node_modules` is reused):
 
 ```bash
 docker run --rm -it \
-  -e HOME=/usr/src/app \
-  -v "$(pwd)":/usr/src/app:Z \
-  -w /usr/src/app \
-  tinpotnick/projectrtp \
-  ./node_modules/mocha/bin/_mocha --recursive --check-leaks --grep 'Create call and send 183 - early - SAVPF'
+  -v "$(pwd)/lib":/usr/src/callmanager/lib:Z \
+  -v "$(pwd)/test":/usr/src/callmanager/test:Z \
+  -v "$(pwd)/index.js":/usr/src/callmanager/index.js:Z \
+  callmanager:test
+```
+
+### Building the engine locally (no Docker)
 
+If you have Rust + cmake installed you can build the addon straight into the
+installed package and run the tests on the host:
+
+```bash
+( cd node_modules/@babblevoice/projectrtp && npm run build )   # cargo build → build/Release/projectrtp.node
+npm test
 ```
 
 # References

package/lib/call.js

@@ -1973,6 +1973,16 @@ class call {
 
     if( options.early ) {
       this.state.early = true
+
+      /* The call is now progressing with early media. Cancel the ring (uac)
+         timeout: a far end that delivers early media (e.g. a carrier sending
+         183 Session Progress) and answers only after the ring timeout would
+         otherwise be torn down with a REQUEST_TIMEOUT (487) just before it
+         answers. Once the dialog is established the non-early answer path
+         clears this timer via #setdialog. */
+      clearTimeout( this._timers.newuac )
+      delete this._timers.newuac
+
       this._em.emit( "call.early", this )
       callmanager.options.em.emit( "call.early", this )
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/babble-drachtio-callmanager",
-  "version": "3.7.31",
+  "version": "3.8.1",
   "description": "Call processing to create a PBX",
   "main": "index.js",
   "scripts": {
@@ -21,12 +21,10 @@
   "license": "MIT",
   "dependencies": {
     "@babblevoice/babble-drachtio-auth": "^1.0.2",
+    "@babblevoice/projectrtp": "^3.2.2",
     "drachtio-srf": "^4.4.47",
     "uuid": "^8.3.2"
   },
-  "optionalDependencies": {
-    "@babblevoice/projectrtp": "^2.6.2"
-  },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.48.2",
     "chai": "^4.3.6",