@fonoster/sipnet 0.27.0 → 0.31.0

package/dist/trunks/operations.d.ts

@@ -1,8 +1,15 @@
-import { TrunkApi } from "@fonoster/types";
-declare function createTrunk(trunks: TrunkApi): (call: {
+import { TrunkApi, TrunkExtended, UpdateTrunkRequest } from "@fonoster/types";
+import { CheckRefs } from "../resources/checkRefs";
+declare function createTrunk(trunks: TrunkApi, checkRefs?: CheckRefs): (call: {
     request: unknown;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
-declare function updateTrunk(trunks: TrunkApi): (call: {
+/**
+ * A partial update: fields the request leaves blank keep their current value (proto3 sends ""
+ * and [] for fields not set, and Routr rejects a trunk without a name or inbound URI). Clearing
+ * the URIs or a reference through an update is therefore not possible; recreate the trunk.
+ */
+export declare function mergeTrunkUpdate(request: UpdateTrunkRequest, current: Partial<TrunkExtended>): UpdateTrunkRequest;
+declare function updateTrunk(trunks: TrunkApi, checkRefs?: CheckRefs): (call: {
     request: unknown;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: unknown) => void) => Promise<void>;
 declare function getTrunk(trunks: TrunkApi): (call: {

package/dist/trunks/operations.js

@@ -1,5 +1,15 @@
 "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.mergeTrunkUpdate = mergeTrunkUpdate;
 exports.createTrunk = createTrunk;
 exports.deleteTrunk = deleteTrunk;
 exports.getTrunk = getTrunk;
@@ -24,17 +34,43 @@ exports.updateTrunk = updateTrunk;
  * limitations under the License.
  */
 const common_1 = require("@fonoster/common");
+const checkRefs_1 = require("../resources/checkRefs");
 const createResource_1 = require("../resources/createResource");
 const deleteResource_1 = require("../resources/deleteResource");
 const getResource_1 = require("../resources/getResource");
 const listResources_1 = require("../resources/listResources");
 const updateResource_1 = require("../resources/updateResource");
 const RESOURCE = "Trunk";
-function createTrunk(trunks) {
-    return (0, createResource_1.createResource)(trunks, RESOURCE, common_1.Validators.createTrunkRequestSchema);
+function createTrunk(trunks, checkRefs) {
+    return (0, createResource_1.createResource)(trunks, RESOURCE, common_1.Validators.createTrunkRequestSchema, (0, checkRefs_1.refsChecker)(checkRefs, checkRefs_1.trunkRefs));
 }
-function updateTrunk(trunks) {
-    return (0, updateResource_1.updateResource)(trunks, RESOURCE, common_1.Validators.updateTrunkRequestSchema);
+const blank = (v) => v === undefined || v === null || v === "" || (Array.isArray(v) && !v.length);
+/**
+ * A partial update: fields the request leaves blank keep their current value (proto3 sends ""
+ * and [] for fields not set, and Routr rejects a trunk without a name or inbound URI). Clearing
+ * the URIs or a reference through an update is therefore not possible; recreate the trunk.
+ */
+function mergeTrunkUpdate(request, current) {
+    const merged = Object.assign({}, request);
+    for (const key of [
+        "name",
+        "inboundUri",
+        "accessControlListRef",
+        "inboundCredentialsRef",
+        "outboundCredentialsRef",
+        "uris"
+    ]) {
+        const value = current[key];
+        if (blank(merged[key]) && !blank(value))
+            merged[key] = value;
+    }
+    return merged;
+}
+function updateTrunk(trunks, checkRefs) {
+    const partial = Object.assign(Object.assign({}, trunks), { getTrunk: (ref) => trunks.getTrunk(ref), updateTrunk: (request) => __awaiter(this, void 0, void 0, function* () {
+            return trunks.updateTrunk(mergeTrunkUpdate(request, yield trunks.getTrunk(request.ref)));
+        }) });
+    return (0, updateResource_1.updateResource)(partial, RESOURCE, common_1.Validators.updateTrunkRequestSchema, (0, checkRefs_1.refsChecker)(checkRefs, checkRefs_1.trunkRefs));
 }
 function getTrunk(trunks) {
     return (0, getResource_1.getResource)(trunks, RESOURCE);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/sipnet",
-  "version": "0.27.0",
+  "version": "0.31.0",
   "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.27.0",
-    "@fonoster/identity": "^0.27.0",
-    "@fonoster/logger": "^0.27.0",
-    "@fonoster/types": "^0.27.0",
-    "@grpc/grpc-js": "~1.10.6",
-    "@routr/sdk": "2.13.1",
+    "@fonoster/common": "^0.31.0",
+    "@fonoster/identity": "^0.31.0",
+    "@fonoster/logger": "^0.31.0",
+    "@fonoster/types": "^0.31.0",
+    "@grpc/grpc-js": "~1.14.6",
+    "@routr/sdk": "2.19.0",
     "zod": "^3.23.8"
   },
   "files": [
@@ -41,5 +40,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/fonoster/issues"
   },
-  "gitHead": "1191b34677b51a36000177887ff82303ef2693e1"
+  "gitHead": "f0a5102dddeea0f70f659234108805bc10690f2e"
 }