@fonoster/sipnet 0.16.8 → 0.17.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Fonoster Inc
+Copyright (c) 2026 Fonoster Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/dist/numbers/listNumbers.js

@@ -30,21 +30,29 @@ exports.listNumbers = listNumbers;
  */
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
+const paginationUtils_1 = require("../resources/paginationUtils");
 const convertToFonosterNumber_1 = require("./convertToFonosterNumber");
 const logger = (0, logger_1.getLogger)({ service: "sipnet", filePath: __filename });
 function listNumbers(api) {
     const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
         const { request } = call;
         logger.verbose("call to listNumbers", Object.assign({}, request));
-        const response = yield api.listNumbers(request);
         const accessKeyId = (0, common_1.getAccessKeyIdFromCall)(call);
-        const items = response.items
-            .filter((item) => item.extended.accessKeyId === accessKeyId)
-            .map(convertToFonosterNumber_1.convertToFonosterNumber);
-        callback(null, {
-            items: items,
-            nextPageToken: response.nextPageToken
+        const requestWithPageToken = request;
+        const pageSize = requestWithPageToken.pageSize || 20;
+        const response = yield (0, paginationUtils_1.paginateWithFiltering)({
+            pageSize,
+            pageToken: requestWithPageToken.pageToken,
+            fetchPage: (pageToken, fetchPageSize) => __awaiter(this, void 0, void 0, function* () {
+                const normalizedRequest = Object.assign(Object.assign({}, request), { pageToken, pageSize: fetchPageSize });
+                return yield api.listNumbers(normalizedRequest);
+            }),
+            filterItems: (items) => {
+                // Filter by accessKeyId and convert to Fonoster number format
+                return (0, paginationUtils_1.filterByAccessKeyId)(items, accessKeyId).map(convertToFonosterNumber_1.convertToFonosterNumber);
+            }
         });
+        callback(null, response);
     });
     return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.listRequestSchema);
 }

package/dist/resources/listResources.js

@@ -30,6 +30,7 @@ exports.listResources = listResources;
  */
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
+const paginationUtils_1 = require("./paginationUtils");
 const logger = (0, logger_1.getLogger)({ service: "sipnet", filePath: __filename });
 function listResources(api, resource) {
     const fn = (call, callback) => __awaiter(this, void 0, void 0, function* () {
@@ -37,12 +38,18 @@ function listResources(api, resource) {
         const res = resource === "Credentials" ? "Credential" : resource;
         logger.verbose(`call to list${res}s`, { request });
         const accessKeyId = (0, common_1.getAccessKeyIdFromCall)(call);
-        const response = yield api[`list${res}s`](request);
-        const items = response.items.filter((item) => { var _a; return ((_a = item.extended) === null || _a === void 0 ? void 0 : _a.accessKeyId) === accessKeyId; });
-        callback(null, {
-            items,
-            nextPageToken: response.nextPageToken
+        const requestWithPageToken = request;
+        const pageSize = requestWithPageToken.pageSize || 20;
+        const response = yield (0, paginationUtils_1.paginateWithFiltering)({
+            pageSize,
+            pageToken: requestWithPageToken.pageToken,
+            fetchPage: (pageToken, fetchPageSize) => __awaiter(this, void 0, void 0, function* () {
+                const normalizedRequest = Object.assign(Object.assign({}, request), { pageToken, pageSize: fetchPageSize });
+                return yield api[`list${res}s`](normalizedRequest);
+            }),
+            filterItems: (items) => (0, paginationUtils_1.filterByAccessKeyId)(items, accessKeyId)
         });
+        callback(null, response);
     });
     return (0, common_1.withErrorHandlingAndValidation)(fn, common_1.Validators.listRequestSchema);
 }

package/dist/resources/paginationUtils.d.ts

@@ -0,0 +1,59 @@
+/**
+ * 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.
+ */
+type ListResponse<T> = {
+    items: T[];
+    nextPageToken?: string;
+};
+type PaginatedListOptions<TInput, TOutput = TInput> = {
+    pageSize: number;
+    pageToken?: string;
+    fetchPage: (pageToken: string | undefined, pageSize: number) => Promise<ListResponse<TInput>>;
+    filterItems: (items: TInput[]) => TOutput[];
+    maxIterations?: number;
+};
+/**
+ * Normalizes empty string pageToken to undefined.
+ * Empty strings are falsy in JS, but gRPC/protobuf may send them as empty strings.
+ */
+export declare function normalizePageToken(pageToken?: string): string | undefined;
+/**
+ * Normalizes empty string nextPageToken from response to undefined.
+ */
+export declare function normalizeNextPageToken(nextPageToken?: string): string | undefined;
+/**
+ * Filters items by accessKeyId from extended field.
+ */
+export declare function filterByAccessKeyId<T extends {
+    extended?: {
+        accessKeyId?: string;
+    };
+}>(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
+ *
+ * This handles the case where the first pages contain items from other customers.
+ *
+ * @template TInput - The type of items returned from the API
+ * @template TOutput - The type of items after filtering/transformation (defaults to TInput)
+ */
+export declare function paginateWithFiltering<TInput, TOutput = TInput>(options: PaginatedListOptions<TInput, TOutput>): Promise<ListResponse<TOutput>>;
+export {};

package/dist/resources/paginationUtils.js

@@ -0,0 +1,103 @@
+"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.normalizePageToken = normalizePageToken;
+exports.normalizeNextPageToken = normalizeNextPageToken;
+exports.filterByAccessKeyId = filterByAccessKeyId;
+exports.paginateWithFiltering = paginateWithFiltering;
+/**
+ * Normalizes empty string pageToken to undefined.
+ * Empty strings are falsy in JS, but gRPC/protobuf may send them as empty strings.
+ */
+function normalizePageToken(pageToken) {
+    return pageToken === "" ? undefined : pageToken;
+}
+/**
+ * Normalizes empty string nextPageToken from response to undefined.
+ */
+function normalizeNextPageToken(nextPageToken) {
+    return nextPageToken && nextPageToken !== "" ? nextPageToken : undefined;
+}
+/**
+ * Filters items by accessKeyId from extended field.
+ */
+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
+ *
+ * This handles the case where the first pages contain items from other customers.
+ *
+ * @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* () {
+        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 = undefined;
+                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 = undefined;
+                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 : undefined;
+                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 : undefined;
+                break;
+            }
+        }
+        return {
+            items: items.slice(0, pageSize),
+            nextPageToken
+        };
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/sipnet",
-  "version": "0.16.8",
+  "version": "0.17.0",
   "description": "Routr-based SIP stack",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -20,10 +20,10 @@
     "fonoster": "./dist/index.js"
   },
   "dependencies": {
-    "@fonoster/common": "^0.16.8",
-    "@fonoster/identity": "^0.16.8",
-    "@fonoster/logger": "^0.16.7",
-    "@fonoster/types": "^0.16.7",
+    "@fonoster/common": "^0.17.0",
+    "@fonoster/identity": "^0.17.0",
+    "@fonoster/logger": "^0.17.0",
+    "@fonoster/types": "^0.17.0",
     "@grpc/grpc-js": "~1.10.6",
     "@routr/sdk": "2.13.1",
     "zod": "^3.23.8"
@@ -41,5 +41,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/fonoster/issues"
   },
-  "gitHead": "5972440bc8106a5db4b3536129b60d1df30fe6b3"
+  "gitHead": "4d1a9afaec6f294184386e009d1a4e292fb3583b"
 }