@fonoster/sipnet 0.6.2 → 0.7.0

package/dist/acls/buildService.d.ts

@@ -11,13 +11,13 @@ declare function buildService(clientOptions: ClientOptions): {
             request: import("@fonoster/types").CreateAclRequest;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").AclExtended) => void) => Promise<void>;
         updateAcl: (call: {
-            request: import("@fonoster/types").UpdateAclRequest;
+            request: import("@fonoster/types/dist/utils").Flatten<import("@fonoster/types").BaseApiObject & Partial<import("@fonoster/types").CreateAclRequest>>;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").AclExtended) => void) => Promise<void>;
         getAcl: (call: {
             request: import("@fonoster/types").BaseApiObject;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").AclExtended) => void) => Promise<void>;
         listAcls: (call: {
-            request: import("@fonoster/types").ListAclsRequest;
+            request: import("@fonoster/types").ListRequest;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: {
             nextPageToken?: string;
             items: import("@fonoster/types").AclExtended[];

package/dist/acls/buildService.js

@@ -25,7 +25,7 @@ exports.buildService = buildService;
 const sdk_1 = __importDefault(require("@routr/sdk"));
 const operations_1 = require("./operations");
 function buildService(clientOptions) {
-    const client = new sdk_1.default.ACL(clientOptions);
+    const client = new sdk_1.default.Acls(clientOptions);
     return {
         definition: {
             serviceName: "Acls",

package/dist/acls/operations.d.ts

@@ -1,15 +1,15 @@
-import { AclExtended, AclsApi, BaseApiObject, CreateAclRequest, ListAclsRequest, UpdateAclRequest } from "@fonoster/types";
+import { AclExtended, AclsApi, BaseApiObject, CreateAclRequest } from "@fonoster/types";
 declare function createAcl(acls: AclsApi): (call: {
     request: CreateAclRequest;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: AclExtended) => void) => Promise<void>;
 declare function updateAcl(acls: AclsApi): (call: {
-    request: UpdateAclRequest;
+    request: import("@fonoster/types/dist/utils").Flatten<BaseApiObject & Partial<CreateAclRequest>>;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: AclExtended) => void) => Promise<void>;
 declare function getAcl(acls: AclsApi): (call: {
     request: BaseApiObject;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: AclExtended) => void) => Promise<void>;
 declare function listAcls(acls: AclsApi): (call: {
-    request: ListAclsRequest;
+    request: import("@fonoster/types").ListRequest;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: {
     nextPageToken?: string;
     items: AclExtended[];

package/dist/acls/operations.js

@@ -10,7 +10,7 @@ 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 = "ACL";
+const RESOURCE = "Acl";
 function createAcl(acls) {
     return (0, createResource_1.createResource)(acls, RESOURCE);
 }

package/dist/agents/buildService.d.ts

@@ -11,13 +11,13 @@ declare function buildService(clientOptions: ClientOptions): {
             request: import("@fonoster/types").CreateAgentRequestExtended;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").AgentExtended) => void) => Promise<void>;
         updateAgent: (call: {
-            request: import("@fonoster/types").UpdateAgentRequest;
+            request: import("@fonoster/types/dist/utils").Flatten<import("@fonoster/types").BaseApiObject & Omit<Partial<import("@fonoster/types").CreateAgentRequest>, "username" | "extended">>;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").AgentExtended) => void) => Promise<void>;
         getAgent: (call: {
             request: import("@fonoster/types").BaseApiObject;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").AgentExtended) => void) => Promise<void>;
         listAgents: (call: {
-            request: import("@fonoster/types").ListAgentsRequest;
+            request: import("@fonoster/types").ListRequest;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: {
             nextPageToken?: string;
             items: import("@fonoster/types").AgentExtended[];

package/dist/agents/operations.d.ts

@@ -1,15 +1,15 @@
-import { AgentExtended, AgentsApi, BaseApiObject, CreateAgentRequestExtended, ListAgentsRequest, UpdateAgentRequest } from "@fonoster/types";
+import { AgentExtended, AgentsApi, BaseApiObject, CreateAgentRequestExtended } from "@fonoster/types";
 declare function createAgent(agents: AgentsApi): (call: {
     request: CreateAgentRequestExtended;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: AgentExtended) => void) => Promise<void>;
 declare function updateAgent(agents: AgentsApi): (call: {
-    request: UpdateAgentRequest;
+    request: import("@fonoster/types/dist/utils").Flatten<BaseApiObject & Omit<Partial<import("@fonoster/types").CreateAgentRequest>, "username" | "extended">>;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: AgentExtended) => void) => Promise<void>;
 declare function getAgent(agents: AgentsApi): (call: {
     request: BaseApiObject;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: AgentExtended) => void) => Promise<void>;
 declare function listAgents(agents: AgentsApi): (call: {
-    request: ListAgentsRequest;
+    request: import("@fonoster/types").ListRequest;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: {
     nextPageToken?: string;
     items: AgentExtended[];

package/dist/credentials/buildService.d.ts

@@ -11,13 +11,15 @@ declare function buildService(clientOptions: ClientOptions): {
             request: import("@fonoster/types").CreateCredentialsRequestExtended;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").CredentialsExtended) => void) => Promise<void>;
         updateCredentials: (call: {
-            request: import("@fonoster/types").UpdateCredentialsRequest;
+            request: import("@fonoster/types/dist/utils").Flatten<import("@fonoster/types").BaseApiObject & {
+                name: string;
+            }>;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").CredentialsExtended) => void) => Promise<void>;
         getCredentials: (call: {
             request: import("@fonoster/types").BaseApiObject;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").CredentialsExtended) => void) => Promise<void>;
         listCredentials: (call: {
-            request: import("@fonoster/types").ListCredentialsRequest;
+            request: import("@fonoster/types").ListRequest;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: {
             nextPageToken?: string;
             items: import("@fonoster/types").CredentialsExtended[];

package/dist/credentials/operations.d.ts

@@ -1,15 +1,17 @@
-import { BaseApiObject, CreateCredentialsRequestExtended, CredentialsApi, CredentialsExtended, ListCredentialsRequest, UpdateCredentialsRequest } from "@fonoster/types";
+import { BaseApiObject, CreateCredentialsRequestExtended, CredentialsApi, CredentialsExtended } from "@fonoster/types";
 declare function createCredentials(credentials: CredentialsApi): (call: {
     request: CreateCredentialsRequestExtended;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: CredentialsExtended) => void) => Promise<void>;
 declare function updateCredentials(credentials: CredentialsApi): (call: {
-    request: UpdateCredentialsRequest;
+    request: import("@fonoster/types/dist/utils").Flatten<BaseApiObject & {
+        name: string;
+    }>;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: CredentialsExtended) => void) => Promise<void>;
 declare function getCredentials(credentials: CredentialsApi): (call: {
     request: BaseApiObject;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: CredentialsExtended) => void) => Promise<void>;
 declare function listCredentials(credentials: CredentialsApi): (call: {
-    request: ListCredentialsRequest;
+    request: import("@fonoster/types").ListRequest;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: {
     nextPageToken?: string;
     items: CredentialsExtended[];

package/dist/domains/buildService.d.ts

@@ -11,13 +11,13 @@ declare function buildService(clientOptions: ClientOptions): {
             request: import("@fonoster/types").CreateDomainRequestExtended;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").DomainExtended) => void) => Promise<void>;
         updateDomain: (call: {
-            request: import("@fonoster/types").UpdateDomainRequest;
+            request: import("@fonoster/types/dist/utils").Flatten<import("@fonoster/types").BaseApiObject & Omit<Partial<import("@fonoster/types").CreateDomainRequest>, "domainUri">>;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").DomainExtended) => void) => Promise<void>;
         getDomain: (call: {
             request: import("@fonoster/types").BaseApiObject;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").DomainExtended) => void) => Promise<void>;
         listDomains: (call: {
-            request: import("@fonoster/types").ListDomainsRequest;
+            request: import("@fonoster/types").ListRequest;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: {
             nextPageToken?: string;
             items: import("@fonoster/types").DomainExtended[];

package/dist/domains/operations.d.ts

@@ -1,15 +1,15 @@
-import { BaseApiObject, CreateDomainRequestExtended, DomainExtended, DomainsApi, ListDomainsRequest, UpdateDomainRequest } from "@fonoster/types";
+import { BaseApiObject, CreateDomainRequestExtended, DomainExtended, DomainsApi } from "@fonoster/types";
 declare function createDomain(domains: DomainsApi): (call: {
     request: CreateDomainRequestExtended;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: DomainExtended) => void) => Promise<void>;
 declare function updateDomain(domains: DomainsApi): (call: {
-    request: UpdateDomainRequest;
+    request: import("@fonoster/types/dist/utils").Flatten<BaseApiObject & Omit<Partial<import("@fonoster/types").CreateDomainRequest>, "domainUri">>;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: DomainExtended) => void) => Promise<void>;
 declare function getDomain(domains: DomainsApi): (call: {
     request: BaseApiObject;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: DomainExtended) => void) => Promise<void>;
 declare function listDomains(domains: DomainsApi): (call: {
-    request: ListDomainsRequest;
+    request: import("@fonoster/types").ListRequest;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: {
     nextPageToken?: string;
     items: DomainExtended[];

package/dist/numbers/buildService.d.ts

@@ -9,20 +9,17 @@ declare function buildService(clientOptions: ClientOptions, checkNumberPrecondit
     };
     handlers: {
         createNumber: (call: {
-            request: import("@fonoster/types").FCreateNumberRequest;
+            request: import("@fonoster/types").CreateNumberRequest;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").BaseApiObject) => void) => Promise<void>;
         updateNumber: (call: {
-            request: import("@fonoster/types").FUpdateNumberRequest;
+            request: import("@fonoster/types").UpdateNumberRequest;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").BaseApiObject) => void) => Promise<void>;
         getNumber: (call: {
             request: import("@fonoster/types").BaseApiObject;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").INumberExtended) => void) => Promise<void>;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").BaseApiObject) => void) => Promise<void>;
         listNumbers: (call: {
             request: import("@fonoster/types").ListNumbersRequest;
-        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: {
-            nextPageToken?: string;
-            items: import("@fonoster/types").INumberExtended[];
-        }) => void) => Promise<void>;
+        }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").ListNumbersResponse) => void) => Promise<void>;
         deleteNumber: (call: {
             request: import("@fonoster/types").BaseApiObject;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").INumberExtended) => void) => Promise<void>;

package/dist/numbers/buildService.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildService = buildService;
 const sdk_1 = __importDefault(require("@routr/sdk"));
 const createNumber_1 = require("./createNumber");
+const getNumber_1 = require("./getNumber");
+const listNumbers_1 = require("./listNumbers");
 const operations_1 = require("./operations");
 const updateNumber_1 = require("./updateNumber");
 function buildService(clientOptions, checkNumberPreconditions) {
@@ -20,8 +22,8 @@ function buildService(clientOptions, checkNumberPreconditions) {
         handlers: {
             createNumber: (0, createNumber_1.createNumber)(client, checkNumberPreconditions),
             updateNumber: (0, updateNumber_1.updateNumber)(client, checkNumberPreconditions),
-            getNumber: (0, operations_1.getNumber)(client),
-            listNumbers: (0, operations_1.listNumbers)(client),
+            getNumber: (0, getNumber_1.getNumber)(client),
+            listNumbers: (0, listNumbers_1.listNumbers)(client),
             deleteNumber: (0, operations_1.deleteNumber)(client)
         }
     };

package/dist/numbers/convertToFonosterNumber.d.ts

@@ -0,0 +1,3 @@
+import { INumber, INumberExtended } from "@fonoster/types";
+declare function convertToFonosterNumber(number: INumberExtended): INumber;
+export { convertToFonosterNumber };

package/dist/numbers/convertToFonosterNumber.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToFonosterNumber = convertToFonosterNumber;
+const constants_1 = require("../constants");
+function convertToFonosterNumber(number) {
+    var _a, _b;
+    const appRef = (_b = (_a = number.extraHeaders) === null || _a === void 0 ? void 0 : _a.find((header) => header.name === constants_1.APP_REF_HEADER)) === null || _b === void 0 ? void 0 : _b.value;
+    return {
+        ref: number.ref,
+        name: number.name,
+        telUrl: number.telUrl,
+        appRef,
+        agentAor: appRef ? undefined : number.aorLink,
+        city: number.city,
+        country: number.country,
+        countryIsoCode: number.countryIsoCode,
+        trunk: number.trunk,
+        createdAt: new Date(number.createdAt * 1000),
+        updatedAt: new Date(number.updatedAt * 1000)
+    };
+}

package/dist/numbers/convertToRoutrNumber.d.ts

@@ -1,5 +1,5 @@
-import { FCreateNumberRequest } from "@fonoster/types";
-declare function convertToRoutrNumber(number: FCreateNumberRequest, accessKeyId: string): {
+import { CreateNumberRequest, UpdateNumberRequest } from "@fonoster/types";
+declare function convertToRoutrNumber(number: CreateNumberRequest, accessKeyId: string): {
     name: string;
     telUrl: string;
     aorLink: string;
@@ -10,9 +10,17 @@ declare function convertToRoutrNumber(number: FCreateNumberRequest, accessKeyId:
         name: string;
         value: string;
     }[];
-    extended: {
-        accessKeyId: string;
-    };
-    sessionAffinityHeader: string;
+    trunkRef: string;
+    extended: Record<string, unknown>;
 };
-export { convertToRoutrNumber };
+declare function convertToRoutrNumberUpdate(number: UpdateNumberRequest): {
+    ref: string;
+    name: string;
+    aorLink: string;
+    extraHeaders: {
+        name: string;
+        value: string;
+    }[];
+    trunkRef: string;
+};
+export { convertToRoutrNumber, convertToRoutrNumberUpdate };

package/dist/numbers/convertToRoutrNumber.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToRoutrNumber = convertToRoutrNumber;
+exports.convertToRoutrNumberUpdate = convertToRoutrNumberUpdate;
 const constants_1 = require("../constants");
 function convertToRoutrNumber(number, accessKeyId) {
+    const aorLink = number.appRef ? constants_1.ROUTR_DEFAULT_PEER_AOR : number.agentAor;
     return {
         name: number.name,
         telUrl: number.telUrl,
-        aorLink: number.agentAor || constants_1.ROUTR_DEFAULT_PEER_AOR,
+        aorLink,
         city: number.city,
         country: number.country,
         countryIsoCode: number.countryIsoCode,
@@ -18,8 +20,29 @@ function convertToRoutrNumber(number, accessKeyId) {
                 }
             ]
             : [],
-        extended: { accessKeyId },
-        // TODO: Make this optional upstream in Routr
-        sessionAffinityHeader: ""
+        trunkRef: number.trunkRef,
+        extended: { accessKeyId }
+    };
+}
+function convertToRoutrNumberUpdate(number) {
+    let aorLink;
+    let extraHeaders = [];
+    if (number.appRef) {
+        aorLink = constants_1.ROUTR_DEFAULT_PEER_AOR;
+        extraHeaders.push({
+            name: constants_1.APP_REF_HEADER,
+            value: number.appRef
+        });
+    }
+    else if (number.agentAor) {
+        extraHeaders = null;
+        aorLink = number.agentAor;
+    }
+    return {
+        ref: number.ref,
+        name: number.name,
+        aorLink,
+        extraHeaders,
+        trunkRef: number.trunkRef
     };
 }

package/dist/numbers/createNumber.d.ts

@@ -1,6 +1,6 @@
 import { GrpcErrorMessage, NumberPreconditionsCheck } from "@fonoster/common";
-import { BaseApiObject, FCreateNumberRequest, NumbersApi } from "@fonoster/types";
+import { BaseApiObject, CreateNumberRequest, NumbersApi } from "@fonoster/types";
 declare function createNumber(api: NumbersApi, checkNumberPreconditions: NumberPreconditionsCheck): (call: {
-    request: FCreateNumberRequest;
+    request: CreateNumberRequest;
 }, callback: (error?: GrpcErrorMessage, response?: BaseApiObject) => void) => Promise<void>;
 export { createNumber };

package/dist/numbers/createNumber.js

@@ -42,7 +42,7 @@ function createNumber(api, checkNumberPreconditions) {
             // Validates that the appRef or agentAor exists in the system
             yield checkNumberPreconditions(request);
             const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
-            logger.verbose("call to createNumber", { request, accessKeyId });
+            logger.verbose("call to createNumber", Object.assign(Object.assign({}, request), { accessKeyId }));
             const response = yield api.createNumber((0, convertToRoutrNumber_1.convertToRoutrNumber)(request, accessKeyId));
             callback(null, response);
         }

package/dist/numbers/getNumber.d.ts

@@ -0,0 +1,6 @@
+import { GrpcErrorMessage } from "@fonoster/common";
+import { BaseApiObject, NumbersApi } from "@fonoster/types";
+declare function getNumber(api: NumbersApi): (call: {
+    request: BaseApiObject;
+}, callback: (error?: GrpcErrorMessage, response?: BaseApiObject) => void) => Promise<void>;
+export { getNumber };

package/dist/numbers/getNumber.js

@@ -0,0 +1,47 @@
+"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.getNumber = getNumber;
+/*
+ * Copyright (C) 2024 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.
+ */
+const common_1 = require("@fonoster/common");
+const logger_1 = require("@fonoster/logger");
+const convertToFonosterNumber_1 = require("./convertToFonosterNumber");
+const logger = (0, logger_1.getLogger)({ service: "sipnet", filePath: __filename });
+function getNumber(api) {
+    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const { ref } = call.request;
+        try {
+            logger.verbose("call to getNumber", { ref });
+            const response = yield api.getNumber(ref);
+            callback(null, (0, convertToFonosterNumber_1.convertToFonosterNumber)(response));
+        }
+        catch (e) {
+            (0, common_1.handleError)(e, callback);
+        }
+    });
+}

package/dist/numbers/listNumbers.d.ts

@@ -0,0 +1,6 @@
+import { GrpcErrorMessage } from "@fonoster/common";
+import { ListNumbersRequest, ListNumbersResponse, NumbersApi } from "@fonoster/types";
+declare function listNumbers(api: NumbersApi): (call: {
+    request: ListNumbersRequest;
+}, callback: (error?: GrpcErrorMessage, response?: ListNumbersResponse) => void) => Promise<void>;
+export { listNumbers };

package/dist/numbers/listNumbers.js

@@ -0,0 +1,51 @@
+"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.listNumbers = listNumbers;
+/*
+ * Copyright (C) 2024 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.
+ */
+const common_1 = require("@fonoster/common");
+const logger_1 = require("@fonoster/logger");
+const convertToFonosterNumber_1 = require("./convertToFonosterNumber");
+const logger = (0, logger_1.getLogger)({ service: "sipnet", filePath: __filename });
+function listNumbers(api) {
+    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
+        const { request } = call;
+        logger.verbose("call to listNumbers", Object.assign({}, request));
+        try {
+            const response = yield api.listNumbers(request);
+            const items = response.items.map(convertToFonosterNumber_1.convertToFonosterNumber);
+            callback(null, {
+                items: items,
+                nextPageToken: response.nextPageToken
+            });
+        }
+        catch (e) {
+            (0, common_1.handleError)(e, callback);
+        }
+    });
+}

package/dist/numbers/operations.d.ts

@@ -1,14 +1,5 @@
-import { BaseApiObject, INumberExtended, ListNumbersRequest, NumbersApi } from "@fonoster/types";
-declare function getNumber(numbers: NumbersApi): (call: {
-    request: BaseApiObject;
-}, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: INumberExtended) => void) => Promise<void>;
-declare function listNumbers(numbers: NumbersApi): (call: {
-    request: ListNumbersRequest;
-}, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: {
-    nextPageToken?: string;
-    items: INumberExtended[];
-}) => void) => Promise<void>;
+import { BaseApiObject, INumberExtended, NumbersApi } from "@fonoster/types";
 declare function deleteNumber(numbers: NumbersApi): (call: {
     request: BaseApiObject;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: INumberExtended) => void) => Promise<void>;
-export { getNumber, listNumbers, deleteNumber };
+export { deleteNumber };

package/dist/numbers/operations.js

@@ -1,18 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNumber = getNumber;
-exports.listNumbers = listNumbers;
 exports.deleteNumber = deleteNumber;
 const deleteResource_1 = require("../resources/deleteResource");
-const getResource_1 = require("../resources/getResource");
-const listResources_1 = require("../resources/listResources");
 const RESOURCE = "Number";
-function getNumber(numbers) {
-    return (0, getResource_1.getResource)(numbers, RESOURCE);
-}
-function listNumbers(numbers) {
-    return (0, listResources_1.listResources)(numbers, RESOURCE);
-}
 function deleteNumber(numbers) {
     return (0, deleteResource_1.deleteResource)(numbers, RESOURCE);
 }

package/dist/numbers/updateNumber.d.ts

@@ -1,6 +1,6 @@
 import { GrpcErrorMessage, NumberPreconditionsCheck } from "@fonoster/common";
-import { BaseApiObject, FUpdateNumberRequest, NumbersApi } from "@fonoster/types";
+import { BaseApiObject, NumbersApi, UpdateNumberRequest } from "@fonoster/types";
 declare function updateNumber(api: NumbersApi, checkNumberPreconditions: NumberPreconditionsCheck): (call: {
-    request: FUpdateNumberRequest;
+    request: UpdateNumberRequest;
 }, callback: (error?: GrpcErrorMessage, response?: BaseApiObject) => void) => Promise<void>;
 export { updateNumber };

package/dist/numbers/updateNumber.js

@@ -30,6 +30,7 @@ exports.updateNumber = updateNumber;
  */
 const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
+const convertToRoutrNumber_1 = require("./convertToRoutrNumber");
 const validation_1 = require("./validation");
 const logger = (0, logger_1.getLogger)({ service: "sipnet", filePath: __filename });
 function updateNumber(api, checkNumberPreconditions) {
@@ -39,8 +40,8 @@ function updateNumber(api, checkNumberPreconditions) {
             validation_1.updateNumberRequestSchema.parse(request);
             // Validates that the appRef or agentAor exists in the system
             yield checkNumberPreconditions(request);
-            logger.verbose("call to updateNumber", { request });
-            const response = yield api.updateNumber(request);
+            logger.verbose("call to updateNumber", Object.assign({}, request));
+            const response = yield api.updateNumber((0, convertToRoutrNumber_1.convertToRoutrNumberUpdate)(request));
             callback(null, response);
         }
         catch (e) {

package/dist/numbers/validation.d.ts

@@ -5,35 +5,35 @@ declare const createNumberRequestSchema: z.ZodEffects<z.ZodObject<{
     countryIsoCode: z.ZodEffects<z.ZodString, string, string>;
 }, "strip", z.ZodTypeAny, {
     countryIsoCode?: string;
-    agentAor?: string;
     appRef?: string;
+    agentAor?: string;
 }, {
     countryIsoCode?: string;
-    agentAor?: string;
     appRef?: string;
+    agentAor?: string;
 }>, {
     countryIsoCode?: string;
-    agentAor?: string;
     appRef?: string;
+    agentAor?: string;
 }, {
     countryIsoCode?: string;
-    agentAor?: string;
     appRef?: string;
+    agentAor?: string;
 }>;
 declare const updateNumberRequestSchema: z.ZodEffects<z.ZodObject<{
     agentAor: z.ZodOptional<z.ZodString>;
     appRef: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    agentAor?: string;
     appRef?: string;
-}, {
     agentAor?: string;
+}, {
     appRef?: string;
-}>, {
     agentAor?: string;
+}>, {
     appRef?: string;
-}, {
     agentAor?: string;
+}, {
     appRef?: string;
+    agentAor?: string;
 }>;
 export { createNumberRequestSchema, updateNumberRequestSchema };

package/dist/resources/createResource.js

@@ -36,7 +36,7 @@ function createResource(api, resource) {
     return (call, callback) => __awaiter(this, void 0, void 0, function* () {
         const { request } = call;
         const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
-        logger.verbose(`call to create${resource}`, { request, accessKeyId });
+        logger.verbose(`call to create${resource}`, Object.assign(Object.assign({}, request), { accessKeyId }));
         try {
             const response = yield api[`create${resource}`](Object.assign(Object.assign({}, request), { extended: {
                     accessKeyId

package/dist/resources/updateResource.js

@@ -34,12 +34,7 @@ const logger = (0, logger_1.getLogger)({ service: "sipnet", filePath: __filename
 function updateResource(api, resource) {
     return (0, identity_1.withAccess)((call) => __awaiter(this, void 0, void 0, function* () {
         const { request } = call;
-        const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
-        logger.verbose(`call to update${resource}`, { request });
-        return yield api[`update${resource}`](Object.assign(Object.assign({}, request), { 
-            // FIXME: We should not have to pass the accessKeyId here. Fix upstream!
-            extended: {
-                accessKeyId
-            } }));
+        logger.verbose(`call to update${resource}`, Object.assign({}, request));
+        return yield api[`update${resource}`](request);
     }), (ref) => api[`get${resource}`](ref));
 }

package/dist/trunks/buildService.d.ts

@@ -11,19 +11,19 @@ declare function buildService(clientOptions: ClientOptions): {
             request: import("@fonoster/types").CreateTrunkRequestExtended;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").TrunkExtended) => void) => Promise<void>;
         updateTrunk: (call: {
-            request: import("@fonoster/types").UpdateTrunkRequest;
+            request: import("@fonoster/types/dist/utils").Flatten<import("@fonoster/types").BaseApiObject & Partial<import("@fonoster/types").CreateTrunkRequest>>;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").TrunkExtended) => void) => Promise<void>;
         getTrunk: (call: {
-            request: import("@fonoster/types").GetTrunkRequest;
+            request: import("@fonoster/types").BaseApiObject;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").TrunkExtended) => void) => Promise<void>;
         listTrunks: (call: {
-            request: import("@fonoster/types").ListTrunksRequest;
+            request: import("@fonoster/types").ListRequest;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: {
             nextPageToken?: string;
             items: import("@fonoster/types").TrunkExtended[];
         }) => void) => Promise<void>;
         deleteTrunk: (call: {
-            request: import("@fonoster/types").DeleteTrunkRequest;
+            request: import("@fonoster/types").BaseApiObject;
         }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: import("@fonoster/types").TrunkExtended) => void) => Promise<void>;
     };
 };

package/dist/trunks/operations.d.ts

@@ -1,20 +1,20 @@
-import { CreateTrunkRequestExtended, DeleteTrunkRequest, GetTrunkRequest, ListTrunksRequest, TrunkApi, TrunkExtended, UpdateTrunkRequest } from "@fonoster/types";
+import { BaseApiObject, CreateTrunkRequestExtended, TrunkApi, TrunkExtended } from "@fonoster/types";
 declare function createTrunk(trunks: TrunkApi): (call: {
     request: CreateTrunkRequestExtended;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: TrunkExtended) => void) => Promise<void>;
 declare function updateTrunk(trunks: TrunkApi): (call: {
-    request: UpdateTrunkRequest;
+    request: import("@fonoster/types/dist/utils").Flatten<BaseApiObject & Partial<import("@fonoster/types").CreateTrunkRequest>>;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: TrunkExtended) => void) => Promise<void>;
 declare function getTrunk(trunks: TrunkApi): (call: {
-    request: GetTrunkRequest;
+    request: BaseApiObject;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: TrunkExtended) => void) => Promise<void>;
 declare function listTrunks(trunks: TrunkApi): (call: {
-    request: ListTrunksRequest;
+    request: import("@fonoster/types").ListRequest;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: {
     nextPageToken?: string;
     items: TrunkExtended[];
 }) => void) => Promise<void>;
 declare function deleteTrunk(trunks: TrunkApi): (call: {
-    request: DeleteTrunkRequest;
+    request: BaseApiObject;
 }, callback: (error?: import("@fonoster/common").GrpcErrorMessage, response?: TrunkExtended) => void) => Promise<void>;
 export { createTrunk, updateTrunk, getTrunk, listTrunks, deleteTrunk };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/sipnet",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "description": "Routr-based SIP stack",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -20,12 +20,12 @@
     "fonoster": "./dist/index.js"
   },
   "dependencies": {
-    "@fonoster/common": "^0.6.2",
-    "@fonoster/identity": "^0.6.2",
-    "@fonoster/logger": "^0.6.2",
-    "@fonoster/types": "^0.6.2",
+    "@fonoster/common": "^0.7.0",
+    "@fonoster/identity": "^0.7.0",
+    "@fonoster/logger": "^0.7.0",
+    "@fonoster/types": "^0.7.0",
     "@grpc/grpc-js": "~1.10.6",
-    "@routr/sdk": "2.12.0",
+    "@routr/sdk": "2.13.1",
     "zod": "^3.23.8"
   },
   "files": [
@@ -41,5 +41,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/fonoster/issues"
   },
-  "gitHead": "9b55399d2906479d826a53a5e3bd10206aaaa86d"
+  "gitHead": "afa950ace3b1d022b6dc8be0c3b87a6b8a5ba3c5"
 }