diff --git a/.github/workflows/charts-deployment.yaml b/.github/workflows/charts-deployment.yaml index 21e6e1dce..520cc3f17 100644 --- a/.github/workflows/charts-deployment.yaml +++ b/.github/workflows/charts-deployment.yaml @@ -29,10 +29,9 @@ jobs: persist-credentials: false fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v3 + uses: azure/setup-helm@v4.1.0 with: version: latest - token: ${{ secrets.DEPLOY_KEY }} - name: Package charts run: | mv /tmp/charts charts diff --git a/.github/workflows/docker-hub-release.yaml b/.github/workflows/docker-hub-release.yaml index ddcf5d139..5603e16f0 100644 --- a/.github/workflows/docker-hub-release.yaml +++ b/.github/workflows/docker-hub-release.yaml @@ -12,12 +12,12 @@ jobs: steps: - name: Login to GitHub Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_PASSWORD }} - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Get the current version @@ -35,11 +35,11 @@ jobs: needs: [download_artifacts] steps: - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Publish the Routr One image uses: elgohr/Publish-Docker-Github-Action@v5 with: @@ -57,11 +57,11 @@ jobs: needs: [download_artifacts] steps: - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Publish the Edgeport image uses: elgohr/Publish-Docker-Github-Action@v5 with: @@ -81,11 +81,11 @@ jobs: needs: [download_artifacts] steps: - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Publish the image uses: elgohr/Publish-Docker-Github-Action@v5 with: @@ -104,11 +104,11 @@ jobs: needs: [download_artifacts] steps: - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Publish the image uses: elgohr/Publish-Docker-Github-Action@v5 with: @@ -127,11 +127,11 @@ jobs: needs: [download_artifacts] steps: - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Publish the image uses: elgohr/Publish-Docker-Github-Action@v5 with: @@ -150,11 +150,11 @@ jobs: needs: [download_artifacts] steps: - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Publish the image uses: elgohr/Publish-Docker-Github-Action@v5 with: @@ -173,11 +173,11 @@ jobs: needs: [download_artifacts] steps: - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Publish the image uses: elgohr/Publish-Docker-Github-Action@v5 with: @@ -196,11 +196,11 @@ jobs: needs: [download_artifacts] steps: - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Publish the image uses: elgohr/Publish-Docker-Github-Action@v5 with: @@ -220,11 +220,11 @@ jobs: needs: [download_artifacts] steps: - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Publish the image uses: elgohr/Publish-Docker-Github-Action@v5 with: @@ -243,11 +243,11 @@ jobs: needs: [download_artifacts] steps: - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Publish the image uses: elgohr/Publish-Docker-Github-Action@v5 with: @@ -268,11 +268,11 @@ jobs: needs: [download_artifacts] steps: - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Publish the image uses: elgohr/Publish-Docker-Github-Action@v5 with: @@ -293,11 +293,11 @@ jobs: needs: [download_artifacts] steps: - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Publish the image uses: elgohr/Publish-Docker-Github-Action@v5 with: @@ -316,11 +316,11 @@ jobs: needs: [download_artifacts] steps: - name: Download build - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: routr-build - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Publish the image uses: elgohr/Publish-Docker-Github-Action@v5 with: diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml index f628b08ee..f8690c055 100644 --- a/.github/workflows/gh-pages.yaml +++ b/.github/workflows/gh-pages.yaml @@ -26,10 +26,10 @@ jobs: cp -a routr/charts/* /tmp/charts - name: Checkout current repo uses: actions/checkout@v4 - - name: Installing Node - uses: actions/setup-node@v3 + - name: Set up Node.js + uses: actions/setup-node@v4 with: - node-version: "18.x" + node-version: "20.x" - name: Build and populate out directory run: | # Create out directories diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 52caffa7e..359cbee09 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,10 +22,10 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.GH_PAT }} - - name: Installing Node - uses: actions/setup-node@v3 + - name: Set up Node.js + uses: actions/setup-node@v4 with: - node-version: "18.x" + node-version: "20.x" - name: Build project run: npm run make - name: Check for next release @@ -69,7 +69,7 @@ jobs: body: ${{ steps.changelog.outputs.changelog }} draft: true - name: Upload build artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: routr-build path: | diff --git a/.github/workflows/tag-npm-packages.yaml b/.github/workflows/tag-npm-packages.yaml index c28850ec8..960fadb81 100644 --- a/.github/workflows/tag-npm-packages.yaml +++ b/.github/workflows/tag-npm-packages.yaml @@ -16,9 +16,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: - node-version: 18 + node-version: "20.x" - name: Checkout repository uses: actions/checkout@v4 with: diff --git a/.scripts/gen-readme.js b/.scripts/gen-readme.js index 09ba487be..5ef6193b8 100644 --- a/.scripts/gen-readme.js +++ b/.scripts/gen-readme.js @@ -6,17 +6,17 @@ const path = require("path"); // Function to recursively get all .js files from a directory and its subdirectories function getJSFiles(dir) { - const files = fs.readdirSync(dir); - let jsFiles = []; - for (const file of files) { - const fullPath = path.join(dir, file); - if (fs.statSync(fullPath).isDirectory()) { - jsFiles = jsFiles.concat(getJSFiles(fullPath)); - } else if (path.extname(fullPath) === '.js') { - jsFiles.push(fullPath); - } + const files = fs.readdirSync(dir); + let jsFiles = []; + for (const file of files) { + const fullPath = path.join(dir, file); + if (fs.statSync(fullPath).isDirectory()) { + jsFiles = jsFiles.concat(getJSFiles(fullPath)); + } else if (path.extname(fullPath) === '.js') { + jsFiles.push(fullPath); } - return jsFiles; + } + return jsFiles; } const outputFile = path.join(process.cwd(), 'README.md'); @@ -25,30 +25,30 @@ const allJSFiles = getJSFiles(path.join(process.cwd(), "dist")); let fullDocumentation = ''; // Store the entire documentation here for (const file of allJSFiles) { - const templateData = jsdoc2md.getTemplateDataSync({ files: file }); - - /* reduce templateData to an array of class names */ - const classNames = templateData.reduce((names, identifier) => { - if (identifier.kind === "class") names.push(identifier.name); - return names; - }, []); - - /* create a documentation section for each class */ - for (const className of classNames) { - if (["Scanner", "Walker", "Parser", "Filter"].includes(className)) continue; - const template = `{{#class name="${className}"}}{{>docs}}{{/class}}\n`; - fullDocumentation += jsdoc2md.renderSync({ - data: templateData, - template: template - }); - } + const templateData = jsdoc2md.getTemplateDataSync({ files: file }); + + /* reduce templateData to an array of class names */ + const classNames = templateData.reduce((names, identifier) => { + if (identifier.kind === "class") names.push(identifier.name); + return names; + }, []); + + /* create a documentation section for each class */ + for (const className of classNames) { + if (["Scanner", "Walker", "Parser", "Filter"].includes(className)) continue; + const template = `{{#class name="${className}"}}{{>docs}}{{/class}}\n`; + fullDocumentation += jsdoc2md.renderSync({ + data: templateData, + template: template + }); + } } const introFilePath = path.join(process.cwd(), ".intro.md"); if (fs.existsSync(introFilePath)) { - // If intro.md exists, prepend its content to the fullDocumentation - const introContent = fs.readFileSync(introFilePath, 'utf-8'); - fullDocumentation = introContent + "\n\n" + fullDocumentation; + // If intro.md exists, prepend its content to the fullDocumentation + const introContent = fs.readFileSync(introFilePath, 'utf-8'); + fullDocumentation = introContent + "\n\n" + fullDocumentation; } // Save the entire documentation to a single markdown file diff --git a/etc/seet.json b/etc/seet.json index 49b38d9ee..24f59428b 100644 --- a/etc/seet.json +++ b/etc/seet.json @@ -749,6 +749,7 @@ "transportMode": "u1", "target": "sip01.edgeport.net:5060", "domain": "sip.local", + "enabled": false, "userAgents": [ { "mode": "uas", diff --git a/lerna.json b/lerna.json index f32edd95f..e24d6f572 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { "packages": ["mods/*"], - "version": "2.9.0" + "version": "2.9.1" } diff --git a/mods/common/package.json b/mods/common/package.json index 518b4157e..e0216c998 100644 --- a/mods/common/package.json +++ b/mods/common/package.json @@ -1,6 +1,6 @@ { "name": "@routr/common", - "version": "2.9.0", + "version": "2.9.1", "description": "Common package", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", diff --git a/mods/connect/package.json b/mods/connect/package.json index f19ce4cb2..589881c2d 100644 --- a/mods/connect/package.json +++ b/mods/connect/package.json @@ -1,6 +1,6 @@ { "name": "@routr/connect", - "version": "2.9.0", + "version": "2.9.1", "description": "Default processor", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", @@ -28,9 +28,9 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/location": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/location": "^2.9.1", + "@routr/processor": "^2.9.1", "jsonwebtoken": "^9.0.0" }, "devDependencies": { diff --git a/mods/connect/src/utils.ts b/mods/connect/src/utils.ts index aabf4fc9d..324c1fd37 100644 --- a/mods/connect/src/utils.ts +++ b/mods/connect/src/utils.ts @@ -178,6 +178,7 @@ export const createRemotePartyId = ( } } +// Q: Why is this a promise? export const createTrunkAuthentication = async ( trunk: CC.Trunk ): Promise => { diff --git a/mods/ctl/README.md b/mods/ctl/README.md index c86b91b8c..d23a4a606 100644 --- a/mods/ctl/README.md +++ b/mods/ctl/README.md @@ -19,7 +19,7 @@ $ npm install -g @routr/ctl $ rctl COMMAND running command... $ rctl (--version) -@routr/ctl/2.9.0 linux-x64 node-v18.19.1 +@routr/ctl/2.9.1 linux-x64 node-v18.19.1 $ rctl --help [COMMAND] USAGE $ rctl COMMAND @@ -95,7 +95,7 @@ EXAMPLES Creating ACL US Eeast... b148b4b4-6884-4c06-bb7e-bd098f5fe793 ``` -_See code: [src/commands/acl/create.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/acl/create.ts)_ +_See code: [src/commands/acl/create.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/acl/create.ts)_ ## `rctl acl delete [REF]` @@ -118,7 +118,7 @@ EXAMPLES Deleting item 80181ca6-d4aa-4575-9375-8f72b071111... Done ``` -_See code: [src/commands/acl/delete.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/acl/delete.ts)_ +_See code: [src/commands/acl/delete.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/acl/delete.ts)_ ## `rctl acl describe [REF]` @@ -140,7 +140,7 @@ DESCRIPTION shows details of an ACL ``` -_See code: [src/commands/acl/describe.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/acl/describe.ts)_ +_See code: [src/commands/acl/describe.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/acl/describe.ts)_ ## `rctl acl get [REF]` @@ -169,7 +169,7 @@ EXAMPLES 9e7a88f0-8390-42f5-a2cb-689583ba9f4f Local Network ACL 0.0.0.0/0 10.0.0.28 ``` -_See code: [src/commands/acl/get.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/acl/get.ts)_ +_See code: [src/commands/acl/get.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/acl/get.ts)_ ## `rctl acl update REF` @@ -195,7 +195,7 @@ EXAMPLES Updating ACL US East... 80181ca6-d4aa-4575-9375-8f72b07d5555 ``` -_See code: [src/commands/acl/update.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/acl/update.ts)_ +_See code: [src/commands/acl/update.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/acl/update.ts)_ ## `rctl agents create` @@ -218,7 +218,7 @@ EXAMPLES Creating Agent Jhon Doe... b148b4b4-6884-4c06-bb7e-bd098f5fe793 ``` -_See code: [src/commands/agents/create.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/agents/create.ts)_ +_See code: [src/commands/agents/create.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/agents/create.ts)_ ## `rctl agents delete [REF]` @@ -241,7 +241,7 @@ EXAMPLES Deleting item 80181ca6-d4aa-4575-9375-8f72b071111... Done ``` -_See code: [src/commands/agents/delete.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/agents/delete.ts)_ +_See code: [src/commands/agents/delete.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/agents/delete.ts)_ ## `rctl agents describe [REF]` @@ -263,7 +263,7 @@ DESCRIPTION shows details of an Agent ``` -_See code: [src/commands/agents/describe.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/agents/describe.ts)_ +_See code: [src/commands/agents/describe.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/agents/describe.ts)_ ## `rctl agents get [REF]` @@ -292,7 +292,7 @@ EXAMPLES d31f5fb8-e367-42f7-9884-1a7999f53fe8 John Doe jdoe sip.local 1 PRIVATE Yes ``` -_See code: [src/commands/agents/get.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/agents/get.ts)_ +_See code: [src/commands/agents/get.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/agents/get.ts)_ ## `rctl agents update REF` @@ -318,7 +318,7 @@ EXAMPLES Updating Agent John Doe... 80181ca6-d4aa-4575-9375-8f72b07d5555 ``` -_See code: [src/commands/agents/update.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/agents/update.ts)_ +_See code: [src/commands/agents/update.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/agents/update.ts)_ ## `rctl autocomplete [SHELL]` @@ -370,7 +370,7 @@ EXAMPLES Creating Credentials JDoe Access... b148b4b4-6884-4c06-bb7e-bd098f5fe793 ``` -_See code: [src/commands/credentials/create.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/credentials/create.ts)_ +_See code: [src/commands/credentials/create.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/credentials/create.ts)_ ## `rctl credentials delete [REF]` @@ -393,7 +393,7 @@ EXAMPLES Deleting item 80181ca6-d4aa-4575-9375-8f72b071111... Done ``` -_See code: [src/commands/credentials/delete.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/credentials/delete.ts)_ +_See code: [src/commands/credentials/delete.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/credentials/delete.ts)_ ## `rctl credentials describe [REF]` @@ -415,7 +415,7 @@ DESCRIPTION shows details for a set of Credentials ``` -_See code: [src/commands/credentials/describe.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/credentials/describe.ts)_ +_See code: [src/commands/credentials/describe.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/credentials/describe.ts)_ ## `rctl credentials get [REF]` @@ -444,7 +444,7 @@ EXAMPLES 80181ca6-d4aa-4575-9375-8f72b07d6666 Europe ACL 0.0.0.0/0 10.0.0.25 ``` -_See code: [src/commands/credentials/get.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/credentials/get.ts)_ +_See code: [src/commands/credentials/get.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/credentials/get.ts)_ ## `rctl credentials update REF` @@ -470,7 +470,7 @@ EXAMPLES Updating Credentials JDoe Credentials... 80181ca6-d4aa-4575-9375-8f72b07d5555 ``` -_See code: [src/commands/credentials/update.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/credentials/update.ts)_ +_See code: [src/commands/credentials/update.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/credentials/update.ts)_ ## `rctl domains create` @@ -493,7 +493,7 @@ EXAMPLES Creating Domain Local Domain... b148b4b4-6884-4c06-bb7e-bd098f5fe793 ``` -_See code: [src/commands/domains/create.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/domains/create.ts)_ +_See code: [src/commands/domains/create.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/domains/create.ts)_ ## `rctl domains delete [REF]` @@ -516,7 +516,7 @@ EXAMPLES Deleting item 80181ca6-d4aa-4575-9375-8f72b071111... Done ``` -_See code: [src/commands/domains/delete.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/domains/delete.ts)_ +_See code: [src/commands/domains/delete.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/domains/delete.ts)_ ## `rctl domains describe [REF]` @@ -538,7 +538,7 @@ DESCRIPTION show details of a Domain ``` -_See code: [src/commands/domains/describe.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/domains/describe.ts)_ +_See code: [src/commands/domains/describe.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/domains/describe.ts)_ ## `rctl domains get [REF]` @@ -567,7 +567,7 @@ EXAMPLES ab2b6959-f497-4b14-903b-85a7c464b564 Local Domain sip.local ``` -_See code: [src/commands/domains/get.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/domains/get.ts)_ +_See code: [src/commands/domains/get.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/domains/get.ts)_ ## `rctl domains update REF` @@ -593,7 +593,7 @@ EXAMPLES Updating Domain Local... 80181ca6-d4aa-4575-9375-8f72b07d5555 ``` -_See code: [src/commands/domains/update.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/domains/update.ts)_ +_See code: [src/commands/domains/update.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/domains/update.ts)_ ## `rctl numbers create` @@ -616,7 +616,7 @@ EXAMPLES Creating Number (784) 317-8170... a134487f-a668-4509-9ddd-dcbc98175468 ``` -_See code: [src/commands/numbers/create.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/numbers/create.ts)_ +_See code: [src/commands/numbers/create.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/numbers/create.ts)_ ## `rctl numbers delete [REF]` @@ -639,7 +639,7 @@ EXAMPLES Deleting item 80181ca6-d4aa-4575-9375-8f72b071111... Done ``` -_See code: [src/commands/numbers/delete.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/numbers/delete.ts)_ +_See code: [src/commands/numbers/delete.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/numbers/delete.ts)_ ## `rctl numbers describe [REF]` @@ -661,7 +661,7 @@ DESCRIPTION shows details for a Number ``` -_See code: [src/commands/numbers/describe.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/numbers/describe.ts)_ +_See code: [src/commands/numbers/describe.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/numbers/describe.ts)_ ## `rctl numbers get [REF]` @@ -690,7 +690,7 @@ EXAMPLES a134487f-a668-4509-9ddd-dcbc98175468 (785) 317-8070 +17853178070 sip:1001@sip.local Cameron, USA (US) ``` -_See code: [src/commands/numbers/get.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/numbers/get.ts)_ +_See code: [src/commands/numbers/get.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/numbers/get.ts)_ ## `rctl numbers update REF` @@ -716,7 +716,7 @@ EXAMPLES Updating Number (785) 317-8070... 80181ca6-d4aa-4575-9375-8f72b07d5555 ``` -_See code: [src/commands/numbers/update.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/numbers/update.ts)_ +_See code: [src/commands/numbers/update.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/numbers/update.ts)_ ## `rctl peers create` @@ -739,7 +739,7 @@ EXAMPLES Creating Peer Asterisk Conference... b148b4b4-6884-4c06-bb7e-bd098f5fe793 ``` -_See code: [src/commands/peers/create.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/peers/create.ts)_ +_See code: [src/commands/peers/create.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/peers/create.ts)_ ## `rctl peers delete [REF]` @@ -762,7 +762,7 @@ EXAMPLES Deleting item 80181ca6-d4aa-4575-9375-8f72b071111... Done ``` -_See code: [src/commands/peers/delete.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/peers/delete.ts)_ +_See code: [src/commands/peers/delete.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/peers/delete.ts)_ ## `rctl peers describe [REF]` @@ -784,7 +784,7 @@ DESCRIPTION shows details for a Peer ``` -_See code: [src/commands/peers/describe.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/peers/describe.ts)_ +_See code: [src/commands/peers/describe.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/peers/describe.ts)_ ## `rctl peers get [REF]` @@ -813,7 +813,7 @@ EXAMPLES 6f941c63-880c-419a-a72a-4a107cbaf5c5 Asterisk Conference conference sip:conference@sip.local 1 Round Robin Yes ``` -_See code: [src/commands/peers/get.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/peers/get.ts)_ +_See code: [src/commands/peers/get.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/peers/get.ts)_ ## `rctl peers update REF` @@ -839,7 +839,7 @@ EXAMPLES Updating Peer Asterisk Conf... 80181ca6-d4aa-4575-9375-8f72b07d5555 ``` -_See code: [src/commands/peers/update.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/peers/update.ts)_ +_See code: [src/commands/peers/update.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/peers/update.ts)_ ## `rctl plugins` @@ -1105,7 +1105,7 @@ EXAMPLES Creating Trunk T01... b148b4b4-6884-4c06-bb7e-bd098f5fe793 ``` -_See code: [src/commands/trunks/create.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/trunks/create.ts)_ +_See code: [src/commands/trunks/create.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/trunks/create.ts)_ ## `rctl trunks delete [REF]` @@ -1128,7 +1128,7 @@ EXAMPLES Deleting item 80181ca6-d4aa-4575-9375-8f72b071111... Done ``` -_See code: [src/commands/trunks/delete.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/trunks/delete.ts)_ +_See code: [src/commands/trunks/delete.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/trunks/delete.ts)_ ## `rctl trunks describe [REF]` @@ -1150,7 +1150,7 @@ DESCRIPTION shows details for a Trunk ``` -_See code: [src/commands/trunks/describe.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/trunks/describe.ts)_ +_See code: [src/commands/trunks/describe.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/trunks/describe.ts)_ ## `rctl trunks get [REF]` @@ -1179,7 +1179,7 @@ EXAMPLES 8cde8ea9-3c58-4dbe-b2cf-23c4413dd4cc Local sip.t01.provider.net ``` -_See code: [src/commands/trunks/get.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/trunks/get.ts)_ +_See code: [src/commands/trunks/get.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/trunks/get.ts)_ ## `rctl trunks update REF` @@ -1205,5 +1205,5 @@ EXAMPLES Updating Trunk T01... 80181ca6-d4aa-4575-9375-8f72b07d5555 ``` -_See code: [src/commands/trunks/update.ts](https://github.com/fonoster/routr/blob/v2.9.0/mods/ctl/src/commands/trunks/update.ts)_ +_See code: [src/commands/trunks/update.ts](https://github.com/fonoster/routr/blob/v2.9.1/mods/ctl/src/commands/trunks/update.ts)_ diff --git a/mods/ctl/package.json b/mods/ctl/package.json index 42687c191..c49ef6bc6 100644 --- a/mods/ctl/package.json +++ b/mods/ctl/package.json @@ -1,6 +1,6 @@ { "name": "@routr/ctl", - "version": "2.9.0", + "version": "2.9.1", "description": "Routr Command-Line Tool", "author": "Pedro Sanders ", "bin": { @@ -25,8 +25,8 @@ "@oclif/plugin-help": "^5", "@oclif/plugin-plugins": "^2.1.12", "@oclif/plugin-warn-if-update-available": "^2.0.19", - "@routr/common": "^2.9.0", - "@routr/sdk": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/sdk": "^2.9.1", "figlet": "^1.5.2", "fuzzy-search": "^3.2.1", "inquirer": "^8.2.6", diff --git a/mods/dispatcher/package.json b/mods/dispatcher/package.json index 5404055fc..bcbb00095 100644 --- a/mods/dispatcher/package.json +++ b/mods/dispatcher/package.json @@ -1,6 +1,6 @@ { "name": "@routr/dispatcher", - "version": "2.9.0", + "version": "2.9.1", "description": "Receives SIP messages and forwards them to the corresponding Message Processor", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", @@ -35,8 +35,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "ajv": "^6.12.6", "fp-ts": "^2.11.8" }, diff --git a/mods/echo/package.json b/mods/echo/package.json index 57d3a133f..0b3448d81 100644 --- a/mods/echo/package.json +++ b/mods/echo/package.json @@ -1,6 +1,6 @@ { "name": "@routr/echo", - "version": "2.9.0", + "version": "2.9.1", "description": "Dummy implementation of a Processor service", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", @@ -28,8 +28,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0" + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1" }, "files": [ "dist" diff --git a/mods/edgeport/package.json b/mods/edgeport/package.json index 68bd9f122..e8b1cf9b6 100644 --- a/mods/edgeport/package.json +++ b/mods/edgeport/package.json @@ -1,6 +1,6 @@ { "name": "@routr/edgeport", - "version": "2.9.0", + "version": "2.9.1", "description": "SIP endpoint at the edge of the network", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", @@ -29,7 +29,7 @@ "url": "https://github.com/fonoster/routr/issues" }, "dependencies": { - "@routr/common": "^2.9.0", + "@routr/common": "^2.9.1", "ajv": "^6.12.6", "fp-ts": "^2.11.8", "js-yaml": "^4.1.0", diff --git a/mods/location/package.json b/mods/location/package.json index 64285538f..8adf7b4fb 100644 --- a/mods/location/package.json +++ b/mods/location/package.json @@ -1,6 +1,6 @@ { "name": "@routr/location", - "version": "2.9.0", + "version": "2.9.1", "description": "Creates and maintains a list of routes to all registered endpoints", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", @@ -35,8 +35,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "ajv": "^6.12.6", "fp-ts": "^2.11.8", "redis": "^4.0.4" diff --git a/mods/one/package.json b/mods/one/package.json index 41ead7c56..615e070b8 100644 --- a/mods/one/package.json +++ b/mods/one/package.json @@ -1,6 +1,6 @@ { "name": "@routr/one", - "version": "2.9.0", + "version": "2.9.1", "description": "Bundle server with everything needed to run Routr Connect", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", @@ -20,12 +20,12 @@ }, "dependencies": { "@fonoster/logger": "0.3.20", - "@routr/common": "^2.9.0", - "@routr/connect": "^2.9.0", - "@routr/dispatcher": "^2.9.0", - "@routr/location": "^2.9.0", - "@routr/pgdata": "^2.9.0", - "@routr/rtprelay": "^2.9.0" + "@routr/common": "^2.9.1", + "@routr/connect": "^2.9.1", + "@routr/dispatcher": "^2.9.1", + "@routr/location": "^2.9.1", + "@routr/pgdata": "^2.9.1", + "@routr/rtprelay": "^2.9.1" }, "files": [ "dist" diff --git a/mods/pgdata/package.json b/mods/pgdata/package.json index 2fc978a3e..3784c9cd0 100644 --- a/mods/pgdata/package.json +++ b/mods/pgdata/package.json @@ -1,6 +1,6 @@ { "name": "@routr/pgdata", - "version": "2.9.0", + "version": "2.9.1", "description": "Postgres API Server for Routr Connect", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", @@ -32,8 +32,8 @@ "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", "@prisma/client": "^5.9.1", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "google-protobuf": "^3.9.2", "pb-util": "^1.0.3", "phone": "^3.1.32", diff --git a/mods/processor/package.json b/mods/processor/package.json index f3bc9e9a2..334b15766 100644 --- a/mods/processor/package.json +++ b/mods/processor/package.json @@ -1,6 +1,6 @@ { "name": "@routr/processor", - "version": "2.9.0", + "version": "2.9.1", "description": "Processor server and API", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", @@ -23,7 +23,7 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", + "@routr/common": "^2.9.1", "fp-ts": "^2.11.8", "phone": "^3.1.32" }, diff --git a/mods/processor/src/helper.ts b/mods/processor/src/helper.ts index bf4f1ae0b..19d29e1d6 100644 --- a/mods/processor/src/helper.ts +++ b/mods/processor/src/helper.ts @@ -74,10 +74,17 @@ export const isRinging = (request: MessageRequest) => export const isWebRTC = (transport: Transport) => transport === Transport.WS || transport === Transport.WSS +export const isInviteWithSDP = (request: MessageRequest) => + isTypeRequest(request) && hasSDP(request) && request.method === Method.INVITE + +export const isAckWithSDP = (request: MessageRequest) => + isTypeRequest(request) && hasSDP(request) && request.method === Method.ACK + export const isInviteOrAckWithSDP = (request: MessageRequest) => - isTypeRequest(request) && - hasSDP(request) && - (request.method === Method.INVITE || request.method === Method.ACK) + isInviteWithSDP(request) || isAckWithSDP(request) + +export const isResponseWithSDP = (request: MessageRequest) => + isTypeResponse(request) && hasSDP(request) export const isOkOrRingingWithSDP = (request: MessageRequest) => isTypeResponse(request) && diff --git a/mods/registry/package.json b/mods/registry/package.json index af0b3502a..2aa0ad396 100644 --- a/mods/registry/package.json +++ b/mods/registry/package.json @@ -1,6 +1,6 @@ { "name": "@routr/registry", - "version": "2.9.0", + "version": "2.9.1", "description": "Sends trunks registrations and maintains their bindings", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", @@ -35,8 +35,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "ajv": "^6.12.6", "express": "^4.18.2", "fp-ts": "^2.11.8", diff --git a/mods/rtprelay/package.json b/mods/rtprelay/package.json index ae1b80405..65aa39f6d 100644 --- a/mods/rtprelay/package.json +++ b/mods/rtprelay/package.json @@ -1,6 +1,6 @@ { "name": "@routr/rtprelay", - "version": "2.9.0", + "version": "2.9.1", "description": "Media Relay for Routr using RTPengine", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", @@ -29,8 +29,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "rtpengine-client": "^0.4.11" }, "files": [ diff --git a/mods/rtprelay/src/client.ts b/mods/rtprelay/src/client.ts index a60bd3c52..8f62872c2 100644 --- a/mods/rtprelay/src/client.ts +++ b/mods/rtprelay/src/client.ts @@ -29,7 +29,15 @@ import { const Client = require("rtpengine-client").Client const rtpe = new Client({ timeout: RTPENGINE_TIMEOUT }) -export function offer(config: RTPEConfig) { +export function query(config: RTPEConfig) { + return async (request: MessageRequest): Promise => { + return await rtpe.query(config, { + "call-id": request.message.callId.callId + }) + } +} + +export function offer(config: RTPEConfig, invertTags = false) { return async (request: MessageRequest): Promise => { const direction = getDirectionFromRequest(request) const sdpModifiers = getRTPEParamsByDirection(direction) @@ -37,12 +45,12 @@ export function offer(config: RTPEConfig) { ...sdpModifiers, sdp: request.message.body, "call-id": request.message.callId.callId, - "from-tag": request.message.from.tag + "from-tag": invertTags ? request.message.to.tag : request.message.from.tag }) } } -export function answer(config: RTPEConfig) { +export function answer(config: RTPEConfig, invertTags = false) { return async (request: MessageRequest): Promise => { const direction = getDirectionFromResponse(request) const sdpModifiers = getRTPEParamsByDirection(direction) @@ -50,8 +58,10 @@ export function answer(config: RTPEConfig) { ...sdpModifiers, sdp: request.message.body, "call-id": request.message.callId.callId, - "from-tag": request.message.from.tag, - "to-tag": request.message.to.tag + "from-tag": invertTags + ? request.message.to.tag + : request.message.from.tag, + "to-tag": invertTags ? request.message.from.tag : request.message.to.tag }) } } diff --git a/mods/rtprelay/src/service.ts b/mods/rtprelay/src/service.ts index e0be510ee..df422b649 100644 --- a/mods/rtprelay/src/service.ts +++ b/mods/rtprelay/src/service.ts @@ -24,7 +24,7 @@ import Processor, { MessageRequest, Response } from "@routr/processor" -import { offer, answer, del } from "./client" +import { offer, answer, del, query } from "./client" import { CommonErrors as CE } from "@routr/common" import { Direction, RTPEFunction } from "./types" import { getLogger } from "@fonoster/logger" @@ -59,8 +59,8 @@ export default function rtprelay( ? getDirectionFromResponse(req) : getDirectionFromRequest(req) - const sendRequest = async (f: RTPEFunction) => { - const r = await f(rtpeConfig)(req) + const sendRequest = async (f: RTPEFunction, invertTags = false) => { + const r = await f(rtpeConfig, invertTags)(req) if (r.result === "error") { throw new CE.BadRequestError(r["error-reason"]) @@ -71,14 +71,26 @@ export default function rtprelay( return res.send(req) } - if (H.isInviteOrAckWithSDP(req)) { + const queryResponse = await query(rtpeConfig)(req) + const isNewCall = queryResponse.result === "error" + + logger.verbose("request", { + direction, + isNewCall, + type: H.isTypeRequest(req) ? req.method : req.message.responseType + }) + + if (H.isInviteWithSDP(req)) { return await sendRequest(offer) + } else if (H.isAckWithSDP(req)) { + return await sendRequest(answer, true) } else if (H.isRinging(req) && direction === Direction.WEB_TO_PHONE) { // FIXME: This was added to prevent the ringing message from being sent to the // caller while the call is being established. This is a temporary fix req.message.body = "" - return res.send(req) - } else if (H.isOkOrRingingWithSDP(req)) { + } else if (H.isResponseWithSDP(req) && isNewCall) { + return await sendRequest(offer, true) + } else if (H.isResponseWithSDP(req)) { return await sendRequest(answer) } else if (H.isBye(req)) { return await sendRequest(del) diff --git a/mods/rtprelay/src/types.ts b/mods/rtprelay/src/types.ts index 7eacb15c8..eb9b17caa 100644 --- a/mods/rtprelay/src/types.ts +++ b/mods/rtprelay/src/types.ts @@ -54,5 +54,6 @@ export type RTPEFunctionResult = | { result: "error"; "error-reason": string } export type RTPEFunction = ( - config: RTPEConfig + config: RTPEConfig, + invertTags?: boolean ) => (req: MessageRequest) => Promise diff --git a/mods/sdk/package.json b/mods/sdk/package.json index f894debf7..c67cd9733 100644 --- a/mods/sdk/package.json +++ b/mods/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@routr/sdk", - "version": "2.9.0", + "version": "2.9.1", "description": "The Routr SDK for Node.js", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", @@ -27,7 +27,7 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", + "@routr/common": "^2.9.1", "google-protobuf": "^3.9.2", "pb-util": "^1.0.3" }, diff --git a/mods/simpleauth/package.json b/mods/simpleauth/package.json index 5da87ce3b..907191c75 100644 --- a/mods/simpleauth/package.json +++ b/mods/simpleauth/package.json @@ -1,6 +1,6 @@ { "name": "@routr/simpleauth", - "version": "2.9.0", + "version": "2.9.1", "description": "This middleware delegates authentication to an external service", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", @@ -29,8 +29,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "google-protobuf": "^3.9.2" }, "files": [ diff --git a/mods/simpledata/package.json b/mods/simpledata/package.json index c7bffee68..e5c8b689f 100644 --- a/mods/simpledata/package.json +++ b/mods/simpledata/package.json @@ -1,6 +1,6 @@ { "name": "@routr/simpledata", - "version": "2.9.0", + "version": "2.9.1", "description": "Files-based API Server for Routr Connect", "author": "Pedro Sanders ", "homepage": "https://github.com/fonoster/routr#readme", @@ -30,8 +30,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "google-protobuf": "^3.9.2", "jsonpath": "^1.1.1", "pb-util": "^1.0.3" diff --git a/ops/charts/connect/README.md b/ops/charts/connect/README.md index eea326cf1..04e3f37ac 100644 --- a/ops/charts/connect/README.md +++ b/ops/charts/connect/README.md @@ -123,7 +123,7 @@ The [CHANGELOG](https://github.com/fonoster/routr/tree/gh-pages/charts/CHANGELOG | Parameter | Description | Value | | ---------------------------------------------------------- | ------------------------------------------------------------- | ----------------------------------------------------------- | -| `dispatcher.processors` | Processors configuration section | | +| `dispatcher.processors` | Processors configuration section | `[]` | | `dispatcher.processors[*].ref` | Reference to the Processor | `connect-processor` | | `dispatcher.processors[*].servicePrefix` | Prefix for the service (Defaults to the release name) | `{{ .Release.Name }}` | | `dispatcher.processors[*].serviceName` | The name of the service hosting the processor | `{{ .serviceName }}` | @@ -202,7 +202,7 @@ The [CHANGELOG](https://github.com/fonoster/routr/tree/gh-pages/charts/CHANGELOG | `apiserver.verifyClientCert` | To verify the client's certificate during authentication | `false` | | `apiserver.podAnnotations` | Pod annotations | `{}` | | `apiserver.serviceAnnotations` | Service annotations | `{}` | -| `apiserver.autoscaling.miniReplicas` | Minimum number of replicas | `1` | +| `apiserver.autoscaling.minReplicas` | Minimum number of replicas | `1` | | `apiserver.autoscaling.maxReplicas` | Maximum number of replicas | `10` | | `apiserver.autoscaling.targetCPUUtilizationPercentage` | Target CPU utilization percentage | `50` | | `apiserver.autoscaling.targetMemoryUtilizationPercentage` | Target Memory utilization percentage | `70` | @@ -227,7 +227,7 @@ The [CHANGELOG](https://github.com/fonoster/routr/tree/gh-pages/charts/CHANGELOG | `connect.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `connect.podAnnotations` | Pod annotations | `{}` | | `connect.serviceAnnotations` | Service annotations | `{}` | -| `connect.autoscaling.miniReplicas` | Minimum number of replicas | `1` | +| `connect.autoscaling.minReplicas` | Minimum number of replicas | `1` | | `connect.autoscaling.maxReplicas` | Maximum number of replicas | `10` | | `connect.autoscaling.targetCPUUtilizationPercentage` | Target CPU utilization percentage | `50` | | `connect.autoscaling.targetMemoryUtilizationPercentage` | Target Memory utilization percentage | `70` | @@ -277,7 +277,7 @@ The [CHANGELOG](https://github.com/fonoster/routr/tree/gh-pages/charts/CHANGELOG | `requester.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `requester.podAnnotations` | Pod annotations | `{}` | | `requester.serviceAnnotations` | Service annotations | `{}` | -| `requester.autoscaling.miniReplicas` | Minimum number of replicas | `1` | +| `requester.autoscaling.minReplicas` | Minimum number of replicas | `1` | | `requester.autoscaling.maxReplicas` | Maximum number of replicas | `10` | | `requester.autoscaling.targetCPUUtilizationPercentage` | Target CPU utilization percentage | `50` | | `requester.autoscaling.targetMemoryUtilizationPercentage` | Target Memory utilization percentage | `70` | @@ -305,7 +305,7 @@ The [CHANGELOG](https://github.com/fonoster/routr/tree/gh-pages/charts/CHANGELOG | `rtprelay.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `rtprelay.podAnnotations` | Pod annotations | `{}` | | `rtprelay.serviceAnnotations` | Service annotations | `{}` | -| `rtprelay.autoscaling.miniReplicas` | Minimum number of replicas | `1` | +| `rtprelay.autoscaling.minReplicas` | Minimum number of replicas | `1` | | `rtprelay.autoscaling.maxReplicas` | Maximum number of replicas | `10` | | `rtprelay.autoscaling.targetCPUUtilizationPercentage` | Target CPU utilization percentage | `50` | | `rtprelay.autoscaling.targetMemoryUtilizationPercentage` | Target Memory utilization percentage | `70` | @@ -362,11 +362,11 @@ Specify each parameter using the --set key=value[, key=value] argument to helm i ```bash $ helm install --wait my-release \ --set global.logLevel=debug \ - routr/routr + routr/routr-connect ``` Alternatively, you can provide a YAML file that specifies the above parameters' values while installing the chart. For example: ```bash -$ helm install --wait my-release -f values.yaml routr/routr +$ helm install --wait my-release -f values.yaml routr/routr-connect ``` diff --git a/ops/charts/connect/templates/rtprelay/deployment.yaml b/ops/charts/connect/templates/rtprelay/deployment.yaml index 01bb9cea0..c60a4d8a8 100644 --- a/ops/charts/connect/templates/rtprelay/deployment.yaml +++ b/ops/charts/connect/templates/rtprelay/deployment.yaml @@ -43,7 +43,7 @@ spec: - name: RTPENGINE_HOST value: {{ .Values.rtprelay.rtpeHost }} - name: RTPENGINE_PORT - value: {{ .Values.rtprelay.rtpPort | quote}} + value: {{ .Values.rtprelay.rtpePort | quote}} - name: LOGS_LEVEL value: {{ .Values.global.logsLevel }} - name: OTEL_EXPORTER_JAEGER_ENDPOINT diff --git a/ops/charts/connect/values.yaml b/ops/charts/connect/values.yaml index 06cdb3a77..c4b3ea098 100644 --- a/ops/charts/connect/values.yaml +++ b/ops/charts/connect/values.yaml @@ -498,7 +498,7 @@ rtprelay: # RTPEngine host rtpeHost: "" # RTPEngine port - rtpPort: 22222 + rtpePort: 22222 # RTPRelay image configuration image: # RTPRelay image repository diff --git a/package-lock.json b/package-lock.json index 170b85afb..0d8097998 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,7 +59,7 @@ }, "mods/common": { "name": "@routr/common", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@fonoster/grpc-health-check": "^3.1.3", @@ -109,7 +109,7 @@ }, "mods/connect": { "name": "@routr/connect", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@fonoster/logger": "0.3.20", @@ -121,9 +121,9 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/location": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/location": "^2.9.1", + "@routr/processor": "^2.9.1", "jsonwebtoken": "^9.0.0" }, "bin": { @@ -135,7 +135,7 @@ }, "mods/ctl": { "name": "@routr/ctl", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@oclif/core": "^1.24.0", @@ -143,8 +143,8 @@ "@oclif/plugin-help": "^5", "@oclif/plugin-plugins": "^2.1.12", "@oclif/plugin-warn-if-update-available": "^2.0.19", - "@routr/common": "^2.9.0", - "@routr/sdk": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/sdk": "^2.9.1", "figlet": "^1.5.2", "fuzzy-search": "^3.2.1", "inquirer": "^8.2.6", @@ -179,7 +179,7 @@ }, "mods/dispatcher": { "name": "@routr/dispatcher", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@fonoster/logger": "0.3.20", @@ -192,8 +192,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "ajv": "^6.12.6", "fp-ts": "^2.11.8" }, @@ -222,7 +222,7 @@ }, "mods/echo": { "name": "@routr/echo", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@fonoster/logger": "0.3.20", @@ -234,8 +234,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0" + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1" }, "bin": { "run_echo": "dist/runner.js" @@ -243,10 +243,10 @@ }, "mods/edgeport": { "name": "@routr/edgeport", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { - "@routr/common": "^2.9.0", + "@routr/common": "^2.9.1", "ajv": "^6.12.6", "fp-ts": "^2.11.8", "js-yaml": "^4.1.0", @@ -274,7 +274,7 @@ }, "mods/location": { "name": "@routr/location", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@fonoster/logger": "0.3.20", @@ -287,8 +287,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "ajv": "^6.12.6", "fp-ts": "^2.11.8", "redis": "^4.0.4" @@ -318,16 +318,16 @@ }, "mods/one": { "name": "@routr/one", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@fonoster/logger": "0.3.20", - "@routr/common": "^2.9.0", - "@routr/connect": "^2.9.0", - "@routr/dispatcher": "^2.9.0", - "@routr/location": "^2.9.0", - "@routr/pgdata": "^2.9.0", - "@routr/rtprelay": "^2.9.0" + "@routr/common": "^2.9.1", + "@routr/connect": "^2.9.1", + "@routr/dispatcher": "^2.9.1", + "@routr/location": "^2.9.1", + "@routr/pgdata": "^2.9.1", + "@routr/rtprelay": "^2.9.1" }, "bin": { "run_echo": "dist/runner.js" @@ -335,7 +335,7 @@ }, "mods/pgdata": { "name": "@routr/pgdata", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@fonoster/grpc-health-check": "^3.1.3", @@ -351,8 +351,8 @@ "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", "@prisma/client": "^5.9.1", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "google-protobuf": "^3.9.2", "pb-util": "^1.0.3", "phone": "^3.1.32", @@ -369,7 +369,7 @@ }, "mods/processor": { "name": "@routr/processor", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@fonoster/logger": "0.3.20", @@ -383,14 +383,14 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", + "@routr/common": "^2.9.1", "fp-ts": "^2.11.8", "phone": "^3.1.32" } }, "mods/registry": { "name": "@routr/registry", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@grpc/grpc-js": "~1.10.1", @@ -402,8 +402,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "ajv": "^6.12.6", "express": "^4.18.2", "fp-ts": "^2.11.8", @@ -449,7 +449,7 @@ }, "mods/rtprelay": { "name": "@routr/rtprelay", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@fonoster/logger": "0.3.20", @@ -462,8 +462,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "rtpengine-client": "^0.4.11" }, "bin": { @@ -472,7 +472,7 @@ }, "mods/sdk": { "name": "@routr/sdk", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@fonoster/logger": "0.3.20", @@ -485,7 +485,7 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", + "@routr/common": "^2.9.1", "google-protobuf": "^3.9.2", "pb-util": "^1.0.3" }, @@ -495,7 +495,7 @@ }, "mods/simpleauth": { "name": "@routr/simpleauth", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@fonoster/logger": "0.3.20", @@ -508,8 +508,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "google-protobuf": "^3.9.2" }, "bin": { @@ -518,7 +518,7 @@ }, "mods/simpledata": { "name": "@routr/simpledata", - "version": "2.9.0", + "version": "2.9.1", "license": "MIT", "dependencies": { "@fonoster/logger": "0.3.20", @@ -531,8 +531,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.4", "@opentelemetry/sdk-trace-node": "^1.0.4", "@opentelemetry/semantic-conventions": "^1.0.4", - "@routr/common": "^2.9.0", - "@routr/processor": "^2.9.0", + "@routr/common": "^2.9.1", + "@routr/processor": "^2.9.1", "google-protobuf": "^3.9.2", "jsonpath": "^1.1.1", "pb-util": "^1.0.3"