Skip to content

Allow trackers to override url matching #23

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

Open
syaau wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow trackers to override url matching #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions packages/server/src/Tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class Tracker {
this.identifiers = [];
this.initializers = [];
this.contextHandlers = [];
this.matcher = null;

this.onIdentify = this.onIdentify.bind(this);
this.onReconnect = this.onReconnect.bind(this);
Expand All @@ -49,6 +50,10 @@ class Tracker {
this.api = api;
}

onMatch(matcher) {
this.matcher = matcher;
}

onIdent(cb) {
return registerHandler(this.identifiers, cb);
}
Expand Down Expand Up @@ -91,7 +96,7 @@ class Tracker {
user = await this.identifiers.reduce((res, identifier) => {
return res.then((identified) => {
if (identified) return identified;
return identifier(ident);
return identifier(ident, params);
});
}, Promise.resolve(null));
} catch (err) {
Expand Down Expand Up @@ -159,8 +164,13 @@ class Tracker {
});
}

match(url) {
return this.pattern.match(url);
match(url, req) {
const params = this.pattern.match(url);
if (!params || !this.matcher) return params;

const extraParams = this.matcher(req);
if (!extraParams) return false;
return Object.assign(params, extraParams);
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/createServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function createServer({ pulseRate = 30000, killTimeout = 1000 } = {}) {
let reqParams = {};

const tracker = trackers.find((t) => {
const params = t.match(request.url);
const params = t.match(request.url, request);
if (!params) {
return false;
}
Expand Down