Merge pull request #45 from tiennou/fix/loki-compat

AlinaNova21 · web-flow · commit 7105940c2f13 · 2025-05-23T10:14:35.000-05:00
Fix patchLokiOps breaking if the passed regex isn't a string
diff --git a/lib/common/_connect.js b/lib/common/_connect.js
@@ -87,9 +87,11 @@ module.exports = function (config) {
                 // https://github.com/screeps/backend-local/blob/7520c8c7e6a443ad955d25e064dbd151a909d8cb/lib/strongholds.js#L132
                 //
                 // ignore properly escaped sector regex queries
-                } else if (v.match(/\^[EW]\d*\\d[NS]\d*\\d\$/g) === null && v.match(/\^\[[EW]{2}\]\\d\*5\[[NS]{2}\]\\d\*5\$/g) === null) {
+                } else if (typeof v === 'string' && v.match(/\^[EW]\d*\\d[NS]\d*\\d\$/g) === null && v.match(/\^\[[EW]{2}\]\\d\*5\[[NS]{2}\]\\d\*5\$/g) === null) {
                   // default regex escape fix for loki regex queries to work with mongo regex queries
                   query.$regex = v.replace(/\\{1,2}/g, '\\\\')
+                } else {
+                  query.$regex = v
                 }
               }
               if (typeof v === 'object') {

Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,11 @@ module.exports = function (config) {`
`87`	`87`	`// https://github.com/screeps/backend-local/blob/7520c8c7e6a443ad955d25e064dbd151a909d8cb/lib/strongholds.js#L132`
`88`	`88`	`//`
`89`	`89`	`// ignore properly escaped sector regex queries`
`90`		`- } else if (v.match(/\^[EW]\d\\d[NS]\d\\d\$/g) === null && v.match(/\^\[[EW]{2}\]\\d\5\[[NS]{2}\]\\d\5\$/g) === null) {`
	`90`	`+ } else if (typeof v === 'string' && v.match(/\^[EW]\d\\d[NS]\d\\d\$/g) === null && v.match(/\^\[[EW]{2}\]\\d\5\[[NS]{2}\]\\d\5\$/g) === null) {`
`91`	`91`	`// default regex escape fix for loki regex queries to work with mongo regex queries`
`92`	`92`	`query.$regex = v.replace(/\\{1,2}/g, '\\\\')`
	`93`	`+ } else {`
	`94`	`+ query.$regex = v`
`93`	`95`	`}`
`94`	`96`	`}`
`95`	`97`	`if (typeof v === 'object') {`