@fonoster/sipnet 0.30.0 → 0.31.1

package/dist/domains/buildService.d.ts

@@ -1,5 +1,11 @@
 import { ClientOptions } from "../types";
-declare function buildService(clientOptions: ClientOptions): {
+/**
+ * `namesRoot` (e.g. `sip.example.com`) makes every domain one label under it;
+ * leave it out to accept any domain.
+ */
+declare function buildService(clientOptions: ClientOptions, options?: {
+    namesRoot?: string;
+}): {
     definition: {
         serviceName: string;
         pckg: string;

package/dist/domains/buildService.js

@@ -24,8 +24,13 @@ exports.buildService = buildService;
  */
 const sdk_1 = __importDefault(require("@routr/sdk"));
 const checkRefs_1 = require("../resources/checkRefs");
+const sipNames_1 = require("../resources/sipNames");
 const operations_1 = require("./operations");
-function buildService(clientOptions) {
+/**
+ * `namesRoot` (e.g. `sip.example.com`) makes every domain one label under it;
+ * leave it out to accept any domain.
+ */
+function buildService(clientOptions, options = {}) {
     const client = new sdk_1.default.Domains(clientOptions);
     const checkRefs = (0, checkRefs_1.createCheckRefs)((0, checkRefs_1.createRefLookups)(clientOptions));
     return {
@@ -36,8 +41,8 @@ function buildService(clientOptions) {
             proto: "domains.proto"
         },
         handlers: {
-            createDomain: (0, operations_1.createDomain)(client, checkRefs),
-            updateDomain: (0, operations_1.updateDomain)(client, checkRefs),
+            createDomain: (0, sipNames_1.withSipNameCheck)((0, operations_1.createDomain)(client, checkRefs), "domainUri", "domain", options.namesRoot),
+            updateDomain: (0, sipNames_1.withSipNameCheck)((0, operations_1.updateDomain)(client, checkRefs), "domainUri", "domain", options.namesRoot),
             getDomain: (0, operations_1.getDomain)(client),
             listDomains: (0, operations_1.listDomains)(client),
             deleteDomain: (0, operations_1.deleteDomain)(client)

package/dist/numbers/buildService.d.ts

@@ -19,7 +19,7 @@
 import { NumberPreconditionsCheck } from "@fonoster/common";
 import { ClientOptions } from "../types";
 import { NumberRouting } from "./engineRouting";
-/** `routing` picks the peer app-linked numbers point at (default: the media-node peer). */
+/** `routing` picks the peer app-linked numbers point at (default: the roomr peer). */
 declare function buildService(clientOptions: ClientOptions, checkNumberPreconditions: NumberPreconditionsCheck, routing?: NumberRouting): {
     definition: {
         serviceName: string;

package/dist/numbers/buildService.js

@@ -11,7 +11,7 @@ const getNumber_1 = require("./getNumber");
 const listNumbers_1 = require("./listNumbers");
 const operations_1 = require("./operations");
 const updateNumber_1 = require("./updateNumber");
-/** `routing` picks the peer app-linked numbers point at (default: the media-node peer). */
+/** `routing` picks the peer app-linked numbers point at (default: the roomr peer). */
 function buildService(clientOptions, checkNumberPreconditions, routing) {
     const client = new sdk_1.default.Numbers(clientOptions);
     const checkRefs = (0, checkRefs_1.createCheckRefs)((0, checkRefs_1.createRefLookups)(clientOptions));

package/dist/numbers/convertToRoutrNumber.d.ts

@@ -1,6 +1,6 @@
 import { CreateNumberRequest, UpdateNumberRequest } from "@fonoster/types";
 /**
- * `appPeerAor` is the peer an app-linked number routes to: the media-node peer by default (see
+ * `appPeerAor` is the peer an app-linked number routes to: the roomr peer by default (see
  * engineRouting.ts).
  */
 declare function convertToRoutrNumber(number: CreateNumberRequest, accessKeyId: string, appPeerAor?: string): {

package/dist/numbers/convertToRoutrNumber.js

@@ -22,7 +22,7 @@ exports.convertToRoutrNumberUpdate = convertToRoutrNumberUpdate;
  */
 const common_1 = require("@fonoster/common");
 /**
- * `appPeerAor` is the peer an app-linked number routes to: the media-node peer by default (see
+ * `appPeerAor` is the peer an app-linked number routes to: the roomr peer by default (see
  * engineRouting.ts).
  */
 function convertToRoutrNumber(number, accessKeyId, appPeerAor = common_1.ROUTR_DEFAULT_PEER_AOR) {

package/dist/numbers/engineRouting.d.ts

@@ -1,15 +1,15 @@
 /**
- * Where app-linked numbers point (add-media-node 4.1). Asterisk is retired (cleanbreak CB-B3):
- * every app-linked number goes to the media-node peer that Go media nodes register under with
+ * Where app-linked numbers point (add-roomr 4.1). Asterisk is retired (cleanbreak CB-B3):
+ * every app-linked number goes to the roomr peer that Go Roomr nodes register under with
  * least-sessions. `rebuild` is the only engine left; the type stays so repoint reports keep
  * their shape.
  */
 export type VoiceEngine = "rebuild";
 export type EngineRoutingConfig = {
-    /** The media-node peer AOR (default sip:medianode@default). */
-    mediaNodeAor?: string;
+    /** The roomr peer AOR (default sip:roomr@default). */
+    roomrNodeAor?: string;
 };
-export declare const MEDIA_NODE_PEER_AOR = "sip:medianode@default";
+export declare const ROOMR_PEER_AOR = "sip:roomr@default";
 /** The AOR of the retired Asterisk peer, for moving numbers created before the rebuild. */
 export declare const LEGACY_ASTERISK_PEER_AOR = "sip:voice@default";
 export type NumberRouting = {

package/dist/numbers/engineRouting.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LEGACY_ASTERISK_PEER_AOR = exports.MEDIA_NODE_PEER_AOR = void 0;
+exports.LEGACY_ASTERISK_PEER_AOR = exports.ROOMR_PEER_AOR = void 0;
 exports.createNumberRouting = createNumberRouting;
 /**
  * Copyright (C) 2025 by Fonoster Inc (https://fonoster.com)
@@ -30,12 +30,12 @@ exports.createNumberRouting = createNumberRouting;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
-exports.MEDIA_NODE_PEER_AOR = common_1.ROUTR_DEFAULT_PEER_AOR;
+exports.ROOMR_PEER_AOR = common_1.ROUTR_DEFAULT_PEER_AOR;
 /** The AOR of the retired Asterisk peer, for moving numbers created before the rebuild. */
 exports.LEGACY_ASTERISK_PEER_AOR = "sip:voice@default";
 function createNumberRouting(config = {}) {
     var _a;
-    const aor = (_a = config.mediaNodeAor) !== null && _a !== void 0 ? _a : exports.MEDIA_NODE_PEER_AOR;
+    const aor = (_a = config.roomrNodeAor) !== null && _a !== void 0 ? _a : exports.ROOMR_PEER_AOR;
     return {
         engineFor: () => __awaiter(this, void 0, void 0, function* () { return "rebuild"; }),
         aorFor: () => __awaiter(this, void 0, void 0, function* () { return aor; }),

package/dist/numbers/repointNumbers.d.ts

@@ -37,7 +37,7 @@ export type RepointChange = {
     to: string;
 };
 /**
- * Moves app-linked Numbers to the peer routing says (the media nodes). Routr stores `aorLink` on
+ * Moves app-linked Numbers to the peer routing says (the Roomr nodes). Routr stores `aorLink` on
  * each Number, so numbers created for Asterisk keep pointing at it until they are rewritten;
  * agent-linked Numbers are never touched. Returns what changed (or would,
  * with `dryRun`).

package/dist/numbers/repointNumbers.js

@@ -30,7 +30,7 @@ exports.repointNumbers = repointNumbers;
  */
 const common_1 = require("@fonoster/common");
 /**
- * Moves app-linked Numbers to the peer routing says (the media nodes). Routr stores `aorLink` on
+ * Moves app-linked Numbers to the peer routing says (the Roomr nodes). Routr stores `aorLink` on
  * each Number, so numbers created for Asterisk keep pointing at it until they are rewritten;
  * agent-linked Numbers are never touched. Returns what changed (or would,
  * with `dryRun`).

package/dist/numbers/repointNumbersCli.js

@@ -69,11 +69,11 @@ const engineRouting_1 = require("./engineRouting");
 const repointNumbers_1 = require("./repointNumbers");
 /**
  * Moves app-linked Numbers created before the rebuild (pointing at Asterisk's sip:voice@default)
- * to the media-node peer:
+ * to the roomr peer:
  *
  *   node dist/numbers/repointNumbersCli.js <routing.json> [--apply] [--app <ref>]...
  *
- * routing.json holds an EngineRoutingConfig ({ mediaNodeAor }); `{}` uses sip:medianode@default.
+ * routing.json holds an EngineRoutingConfig ({ roomrNodeAor }); `{}` uses sip:roomr@default.
  * Without --apply it only prints what would change. ROUTR_API_ENDPOINT (default routr:51907)
  * points at Routr's API.
  */

package/dist/resources/paginationUtils.d.ts

@@ -45,12 +45,13 @@ export declare function filterByAccessKeyId<T extends {
     };
 }>(items: T[], accessKeyId: string): T[];
 /**
- * Handles pagination with filtering, continuing to fetch pages until:
- * - We have enough items (pageSize)
- * - We run out of pages
- * - We hit the max iterations limit
+ * Pages through Routr's items keeping only the caller's, so that following `nextPageToken` returns
+ * every kept item exactly once (management-api, "Lists page through every item once").
  *
- * This handles the case where the first pages contain items from other customers.
+ * Routr's page token is a cursor on the last ref it returned, so a page can end on any item: when
+ * the page fills in the middle of a backend batch, the token is the ref of the last item kept and
+ * the next call resumes right after it. Batches with none of the caller's items are skipped, up to
+ * `maxIterations` of them; the token then points past the last batch read.
  *
  * @template TInput - The type of items returned from the API
  * @template TOutput - The type of items after filtering/transformation (defaults to TInput)

package/dist/resources/paginationUtils.js

@@ -33,71 +33,50 @@ function filterByAccessKeyId(items, accessKeyId) {
     return items.filter((item) => { var _a; return ((_a = item.extended) === null || _a === void 0 ? void 0 : _a.accessKeyId) === accessKeyId; });
 }
 /**
- * Handles pagination with filtering, continuing to fetch pages until:
- * - We have enough items (pageSize)
- * - We run out of pages
- * - We hit the max iterations limit
+ * Pages through Routr's items keeping only the caller's, so that following `nextPageToken` returns
+ * every kept item exactly once (management-api, "Lists page through every item once").
  *
- * This handles the case where the first pages contain items from other customers.
+ * Routr's page token is a cursor on the last ref it returned, so a page can end on any item: when
+ * the page fills in the middle of a backend batch, the token is the ref of the last item kept and
+ * the next call resumes right after it. Batches with none of the caller's items are skipped, up to
+ * `maxIterations` of them; the token then points past the last batch read.
  *
  * @template TInput - The type of items returned from the API
  * @template TOutput - The type of items after filtering/transformation (defaults to TInput)
  */
 function paginateWithFiltering(options) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         const { pageSize, pageToken, fetchPage, filterItems, maxIterations = 10 } = options;
-        const normalizedPageToken = normalizePageToken(pageToken);
         const items = [];
-        let nextPageToken = "";
-        let currentPageToken = normalizedPageToken;
-        let hasMorePages = true;
-        let iterations = 0;
-        while (items.length < pageSize &&
-            hasMorePages &&
-            iterations < maxIterations) {
-            iterations++;
-            // Request more items to account for filtering
-            const backendRequestedSize = pageSize * 2;
-            const response = yield fetchPage(currentPageToken, backendRequestedSize);
-            if (!response || !response.items) {
-                hasMorePages = false;
-                nextPageToken = "";
-                break;
-            }
-            const filteredItems = filterItems(response.items);
-            items.push(...filteredItems);
-            const backendNextPageToken = normalizeNextPageToken(response.nextPageToken);
-            // If we got no items from backend or no nextPageToken, we're done
-            if (response.items.length === 0 || !backendNextPageToken) {
-                hasMorePages = false;
-                nextPageToken = "";
-                break;
-            }
-            // Check if backend returned fewer items than requested (indicating last page)
-            // If backend returned exactly what we asked for or more, there might be more items
-            const backendHasMoreItems = response.items.length >= backendRequestedSize;
-            // If we've filled the page, we're done
-            if (items.length >= pageSize) {
-                // We filled the page, so there might be more items
-                // Only return nextPageToken if backend indicates there are more items
-                nextPageToken = backendHasMoreItems ? backendNextPageToken : "";
-                break;
-            }
-            // If we got filtered items in this iteration, return them
-            // Only continue if we got 0 filtered items (meaning all items were from other customers)
-            if (filteredItems.length === 0) {
-                // No items matched in this page, continue to next page
-                currentPageToken = backendNextPageToken;
-                nextPageToken = backendNextPageToken;
-            }
-            else {
-                nextPageToken = backendHasMoreItems ? backendNextPageToken : "";
-                break;
+        let cursor = normalizePageToken(pageToken);
+        for (let i = 0; i < maxIterations; i++) {
+            const requested = pageSize * 2;
+            const response = yield fetchPage(cursor, requested);
+            const batch = (_a = response === null || response === void 0 ? void 0 : response.items) !== null && _a !== void 0 ? _a : [];
+            const next = normalizeNextPageToken(response === null || response === void 0 ? void 0 : response.nextPageToken);
+            // Routr may answer a token on its last page too: a short batch that had some of the caller's
+            // items is the end; a short one with none of them is followed, as before.
+            const short = batch.length < requested;
+            let kept = 0;
+            for (const [index, item] of batch.entries()) {
+                const mine = filterItems([item]);
+                if (mine.length === 0)
+                    continue;
+                kept += mine.length;
+                items.push(...mine);
+                if (items.length >= pageSize) {
+                    const lastOfAll = (!next || short) && index === batch.length - 1;
+                    return {
+                        items,
+                        nextPageToken: lastOfAll ? "" : ((_b = item.ref) !== null && _b !== void 0 ? _b : "")
+                    };
+                }
             }
+            if (batch.length === 0 || !next || (short && kept > 0))
+                return { items, nextPageToken: "" };
+            cursor = next;
         }
-        return {
-            items: items.slice(0, pageSize),
-            nextPageToken
-        };
+        return { items, nextPageToken: cursor !== null && cursor !== void 0 ? cursor : "" };
     });
 }

package/dist/resources/sipNames.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Copyright (C) 2025 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/fonoster
+ *
+ * This file is part of Fonoster
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { GrpcErrorMessage } from "@fonoster/common";
+/**
+ * Whether a SIP name (a trunk's inbound URI, a domain) is one label under `root`
+ * (e.g. `acme.sip.example.com` under `sip.example.com`). Without a root
+ * (features.sip.names: any) every name passes; the request schema still checks
+ * it's a host or an IP.
+ */
+export declare function isSipNameAllowed(name: string, root?: string): boolean;
+type Handler<R> = (call: {
+    request: R;
+}, callback: (error?: GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
+/**
+ * Rejects a create or update whose `field` isn't one label under `root` with
+ * INVALID_ARGUMENT. An update that leaves the field blank keeps the current value.
+ */
+export declare function withSipNameCheck<R>(handler: Handler<R>, field: string, what: string, root?: string): Handler<R>;
+export {};

package/dist/resources/sipNames.js

@@ -0,0 +1,46 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSipNameAllowed = isSipNameAllowed;
+exports.withSipNameCheck = withSipNameCheck;
+const grpc_js_1 = require("@grpc/grpc-js");
+/** One DNS label: lowercase letters, digits and inner dashes. */
+const LABEL = /^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$/;
+/**
+ * Whether a SIP name (a trunk's inbound URI, a domain) is one label under `root`
+ * (e.g. `acme.sip.example.com` under `sip.example.com`). Without a root
+ * (features.sip.names: any) every name passes; the request schema still checks
+ * it's a host or an IP.
+ */
+function isSipNameAllowed(name, root) {
+    if (!root)
+        return true;
+    const suffix = `.${root}`;
+    return name.endsWith(suffix) && LABEL.test(name.slice(0, -suffix.length));
+}
+/**
+ * Rejects a create or update whose `field` isn't one label under `root` with
+ * INVALID_ARGUMENT. An update that leaves the field blank keeps the current value.
+ */
+function withSipNameCheck(handler, field, what, root) {
+    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const value = call.request[field];
+        const name = typeof value === "string" ? value : undefined;
+        if (name && !isSipNameAllowed(name, root)) {
+            callback({
+                code: grpc_js_1.status.INVALID_ARGUMENT,
+                message: `The ${what} must be one label under ${root}, such as acme.${root} at "${field}"`
+            });
+            return;
+        }
+        return handler(call, callback);
+    });
+}

package/dist/trunks/buildService.d.ts

@@ -1,5 +1,11 @@
 import { ClientOptions } from "../types";
-declare function buildService(clientOptions: ClientOptions): {
+/**
+ * `namesRoot` (e.g. `sip.example.com`) makes every inbound URI one label under
+ * it; leave it out to accept any host or IP.
+ */
+declare function buildService(clientOptions: ClientOptions, options?: {
+    namesRoot?: string;
+}): {
     definition: {
         serviceName: string;
         pckg: string;

package/dist/trunks/buildService.js

@@ -24,8 +24,13 @@ exports.buildService = buildService;
  */
 const sdk_1 = __importDefault(require("@routr/sdk"));
 const checkRefs_1 = require("../resources/checkRefs");
+const sipNames_1 = require("../resources/sipNames");
 const operations_1 = require("./operations");
-function buildService(clientOptions) {
+/**
+ * `namesRoot` (e.g. `sip.example.com`) makes every inbound URI one label under
+ * it; leave it out to accept any host or IP.
+ */
+function buildService(clientOptions, options = {}) {
     const client = new sdk_1.default.Trunks(clientOptions);
     const checkRefs = (0, checkRefs_1.createCheckRefs)((0, checkRefs_1.createRefLookups)(clientOptions));
     return {
@@ -36,8 +41,8 @@ function buildService(clientOptions) {
             proto: "trunks.proto"
         },
         handlers: {
-            createTrunk: (0, operations_1.createTrunk)(client, checkRefs),
-            updateTrunk: (0, operations_1.updateTrunk)(client, checkRefs),
+            createTrunk: (0, sipNames_1.withSipNameCheck)((0, operations_1.createTrunk)(client, checkRefs), "inboundUri", "inbound URI", options.namesRoot),
+            updateTrunk: (0, sipNames_1.withSipNameCheck)((0, operations_1.updateTrunk)(client, checkRefs), "inboundUri", "inbound URI", options.namesRoot),
             getTrunk: (0, operations_1.getTrunk)(client),
             listTrunks: (0, operations_1.listTrunks)(client),
             deleteTrunk: (0, operations_1.deleteTrunk)(client)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/sipnet",
-  "version": "0.30.0",
+  "version": "0.31.1",
   "description": "Routr-based SIP stack",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -13,19 +13,18 @@
   },
   "scripts": {
     "prebuild": "rimraf ./dist tsconfig.tsbuildinfo",
-    "build": "tsc -b tsconfig.json",
-    "clean": "rimraf ./dist node_modules tsconfig.tsbuildinfo"
+    "build": "tsc -b tsconfig.json"
   },
   "bin": {
     "fonoster": "./dist/index.js"
   },
   "dependencies": {
-    "@fonoster/common": "^0.30.0",
-    "@fonoster/identity": "^0.30.0",
-    "@fonoster/logger": "^0.30.0",
-    "@fonoster/types": "^0.30.0",
+    "@fonoster/common": "^0.31.1",
+    "@fonoster/identity": "^0.31.1",
+    "@fonoster/logger": "^0.31.0",
+    "@fonoster/types": "^0.31.0",
     "@grpc/grpc-js": "~1.14.6",
-    "@routr/sdk": "2.15.2",
+    "@routr/sdk": "2.19.0",
     "zod": "^3.23.8"
   },
   "files": [
@@ -41,5 +40,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/fonoster/issues"
   },
-  "gitHead": "b59b06a3ef325abe3f188c0fb87cc22d50ed5471"
+  "gitHead": "c88962ba4c111de08d156d5b86770add1cade544"
 }