@naturalcycles/backend-lib 5.16.0 → 5.17.1

package/dist/deploy/deploy.util.js

@@ -46,8 +46,11 @@ async function createDeployInfo(backendCfg, overrideBranch) {
     else {
         let branchName = gitBranch;
         if (backendCfg.hashedBranches) {
-            // todo: jira
-            branchName = (0, nodejs_lib_1.md5)(gitBranch).slice(0, 10);
+            // Obfuscates the branch name by hashing it.
+            // If there are Jira issue names in the branch name, the first one found will be used as a prefix.
+            const jiraIssue = gitBranch.match(/([Dd][Ee][Vv]-\d+)/)?.[0];
+            const branchHash = (0, nodejs_lib_1.md5)(gitBranch).slice(0, 10);
+            branchName = [jiraIssue, branchHash].filter(Boolean).join('-');
         }
         gaeService = validateGAEServiceName([branchName, gaeService].join('--'));
     }

package/dist/server/serverStatsMiddleware.js

@@ -58,6 +58,7 @@ const serverStatsHTMLHandler = (req, res) => {
                 '<tr>',
                 `<td><pre>${endpoint}</pre></td>`,
                 `<td align="right"><pre>${stat.total}</pre></td>`,
+                // eslint-disable-next-line @typescript-eslint/no-base-to-string
                 ...families.map(f => `<td align="right"><pre>${stat[f]}</pre></td>`),
                 ...percentiles.map(pc => `<td align="right"><pre>${stat.pc[pc]}</pre></td>`),
                 '</tr>',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "5.16.0",
+  "version": "5.17.1",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",
@@ -18,37 +18,37 @@
     "deploy-health-check-debug2": "yarn tsn ./src/bin/deploy-health-check.ts --url https://api-master2.naturalcycles.com --thresholdUnhealthy 5"
   },
   "peerDependencies": {
-    "@sentry/node": "^7.0.0"
+    "@sentry/node": "^7"
   },
   "dependencies": {
-    "@naturalcycles/db-lib": "^9.1.0",
-    "@naturalcycles/js-lib": "^14.244.0",
-    "@naturalcycles/nodejs-lib": "^13.1.0",
-    "@types/cookie-parser": "^1.4.1",
-    "@types/cors": "^2.8.4",
-    "@types/express": "^5.0.0",
-    "@types/on-finished": "^2.3.1",
-    "cookie-parser": "^1.4.3",
-    "cors": "^2.8.5",
-    "dotenv": "^16.0.0",
-    "ejs": "^3.0.1",
-    "express": "^4.16.4",
-    "express-promise-router": "^4.0.0",
-    "firebase-admin": "^13.0.0",
-    "helmet": "^8.0.0",
-    "on-finished": "^2.3.0",
-    "simple-git": "^3.0.3",
-    "yargs": "^17.0.0"
+    "@naturalcycles/db-lib": "^9",
+    "@naturalcycles/js-lib": "^14",
+    "@naturalcycles/nodejs-lib": "^13",
+    "@types/cookie-parser": "^1",
+    "@types/cors": "^2",
+    "@types/express": "^5",
+    "@types/on-finished": "^2",
+    "cookie-parser": "^1",
+    "cors": "^2",
+    "dotenv": "^16",
+    "ejs": "^3",
+    "express": "^4",
+    "express-promise-router": "^4",
+    "firebase-admin": "^13",
+    "helmet": "^8",
+    "on-finished": "^2",
+    "simple-git": "^3",
+    "yargs": "^17"
   },
   "devDependencies": {
-    "@naturalcycles/bench-lib": "^3.0.0",
-    "@naturalcycles/dev-lib": "^15.0.4",
-    "@sentry/node": "^7.0.0",
-    "@types/ejs": "^3.0.0",
-    "@types/node": "^22.2.0",
-    "@types/yargs": "^16.0.0",
-    "fastify": "^5.0.0",
-    "jest": "^29.0.1"
+    "@naturalcycles/bench-lib": "^3",
+    "@naturalcycles/dev-lib": "^15",
+    "@sentry/node": "^7",
+    "@types/ejs": "^3",
+    "@types/node": "^22",
+    "@types/yargs": "^16",
+    "fastify": "^5",
+    "jest": "^29"
   },
   "files": [
     "dist",

package/src/deploy/deploy.util.ts

@@ -60,8 +60,11 @@ export async function createDeployInfo(
     let branchName = gitBranch
 
     if (backendCfg.hashedBranches) {
-      // todo: jira
-      branchName = md5(gitBranch).slice(0, 10)
+      // Obfuscates the branch name by hashing it.
+      // If there are Jira issue names in the branch name, the first one found will be used as a prefix.
+      const jiraIssue = gitBranch.match(/([Dd][Ee][Vv]-\d+)/)?.[0]
+      const branchHash = md5(gitBranch).slice(0, 10)
+      branchName = [jiraIssue, branchHash].filter(Boolean).join('-')
     }
 
     gaeService = validateGAEServiceName([branchName, gaeService].join('--'))

package/src/server/serverStatsMiddleware.ts

@@ -94,6 +94,7 @@ export const serverStatsHTMLHandler: BackendRequestHandler = (req, res) => {
         '<tr>',
         `<td><pre>${endpoint}</pre></td>`,
         `<td align="right"><pre>${stat.total}</pre></td>`,
+        // eslint-disable-next-line @typescript-eslint/no-base-to-string
         ...families.map(f => `<td align="right"><pre>${stat[f]}</pre></td>`),
         ...percentiles.map(pc => `<td align="right"><pre>${stat.pc![pc]}</pre></td>`),
         '</tr>',