Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: reduce regex usage in getDomainFromOriginOrURL #241

Merged
merged 2 commits into from
Feb 6, 2025
Merged

refactor: reduce regex usage in getDomainFromOriginOrURL #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79841b6
refactor: reduce regex usage in getDomainFromOriginOrURL
connorjclark Feb 6, 2025
b170547
idk why yarn.lock updated
connorjclark Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/create-entity-finder-api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ const ROOT_DOMAIN_REGEX = /[^.]+\.([^.]+|(gov|com|co|ne)\.\w{2})$/i
function getDomainFromOriginOrURL(originOrURL) {
if (typeof originOrURL !== 'string') return null
if (originOrURL.length > 10000 || originOrURL.startsWith('data:')) return null
if (DOMAIN_IN_URL_REGEX.test(originOrURL)) return originOrURL.match(DOMAIN_IN_URL_REGEX)[1]
if (DOMAIN_CHARACTERS.test(originOrURL)) return originOrURL.match(DOMAIN_CHARACTERS)[0]
let m = originOrURL.match(DOMAIN_IN_URL_REGEX)
if (m) return m[1]
m = originOrURL.match(DOMAIN_CHARACTERS)
if (m) return m[0]
return null
}

Expand Down
14 changes: 14 additions & 0 deletions lib/create-entity-finder-api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const fs = require('fs')
const path = require('path')
const {createAPIFromDataset} = require('./create-entity-finder-api.js')

describe('getEntity', () => {
Expand Down Expand Up @@ -41,4 +43,16 @@ describe('getEntity', () => {
expect(api.getEntity('https://bar.example.co.uk/path').name).toEqual('Domain')
expect(api.getEntity('https://baz.bar.example.co.uk/path').name).toEqual('Domain')
})

it.skip('stress test', () => {
const urls = fs
.readFileSync(path.join(__dirname, '../data/random-urls.txt'), 'utf8')
.split('\n')
.filter(Boolean)
console.time('getEntity')
for (let i = 0; i < 1_000_000; i++) {
api.getEntity(urls[i % urls.length])
}
console.timeEnd('getEntity')
})
})