dtoro
d4d99a7473
Problem: the hexagonal refactor churns the backend tree for nine more phases; the UI delivery stack (web/ SPA, cmd/desktop Wails wrapper, compose/web image) must move to its own repo first so doc/layout rewrites land once on a backend-only tree. Change: - New repo git.hubris.network/dtoro/oikos-web (v0.33.0): web/, desktop/ (updateURL repointed to oikos-web releases), compose/, own CI (web + desktop jobs), own deploy script (CI-green gate, TOCTOU guard, version-tagged images, prune-to-3), own webhook receiver on :9798 + launchd unit, own compose project publishing the same 8091:80. - Cutover executed on mac-mini in order: oikos stack's web service stopped+removed, oikos-web project brought up on 8091; outer Caddy untouched (targets the published port) — serving + Authentik flow + /wails 404 quirk verified post-cutover. - Stripped from oikos: web/, cmd/desktop/, compose/web/, desktop CI workflow, ci.yml web job, Makefile ui/desktop/desktop-package/install targets, the compose web service, oikos-web from deploy.sh's fallback prune list; wails + go-keyring dropped from go.mod, vendor synced. - README / CONTRIBUTING / AGENTS.md / .agents dev+operations docs now point at the new repo; mbse + mascot design docs carry a path note. Risk: production SPA serving depends on the new pipeline now; rollback is versioned-image re-up of the old web service from a pre-split checkout (port 8091). Desktop builds installed before the split still check dtoro/oikos releases — one manual reinstall, noted in the oikos-web release notes. Verification: go vet, make test (race), make generate-check, golangci (no new findings; baseline down 400→365); post-cutover curls — localhost:8091 200, /wails/runtime.js 404, outer Caddy 302 Authentik.
64 lines
2.3 KiB
JavaScript
64 lines
2.3 KiB
JavaScript
import { fastPathLookup, } from 'tldts-core';
|
|
import { exceptions, rules } from './data/trie';
|
|
/**
|
|
* Lookup parts of domain in Trie
|
|
*/
|
|
function lookupInTrie(parts, trie, index, allowedMask) {
|
|
let result = null;
|
|
let node = trie;
|
|
while (node !== undefined) {
|
|
// We have a match!
|
|
if ((node[0] & allowedMask) !== 0) {
|
|
result = {
|
|
index: index + 1,
|
|
isIcann: node[0] === 1 /* RULE_TYPE.ICANN */,
|
|
isPrivate: node[0] === 2 /* RULE_TYPE.PRIVATE */,
|
|
};
|
|
}
|
|
// No more `parts` to look for
|
|
if (index === -1) {
|
|
break;
|
|
}
|
|
const succ = node[1];
|
|
node = Object.prototype.hasOwnProperty.call(succ, parts[index])
|
|
? succ[parts[index]]
|
|
: succ['*'];
|
|
index -= 1;
|
|
}
|
|
return result;
|
|
}
|
|
/**
|
|
* Check if `hostname` has a valid public suffix in `trie`.
|
|
*/
|
|
export default function suffixLookup(hostname, options, out) {
|
|
var _a;
|
|
if (fastPathLookup(hostname, options, out)) {
|
|
return;
|
|
}
|
|
const hostnameParts = hostname.split('.');
|
|
const allowedMask = (options.allowPrivateDomains ? 2 /* RULE_TYPE.PRIVATE */ : 0) |
|
|
(options.allowIcannDomains ? 1 /* RULE_TYPE.ICANN */ : 0);
|
|
// Look for exceptions
|
|
const exceptionMatch = lookupInTrie(hostnameParts, exceptions, hostnameParts.length - 1, allowedMask);
|
|
if (exceptionMatch !== null) {
|
|
out.isIcann = exceptionMatch.isIcann;
|
|
out.isPrivate = exceptionMatch.isPrivate;
|
|
out.publicSuffix = hostnameParts.slice(exceptionMatch.index + 1).join('.');
|
|
return;
|
|
}
|
|
// Look for a match in rules
|
|
const rulesMatch = lookupInTrie(hostnameParts, rules, hostnameParts.length - 1, allowedMask);
|
|
if (rulesMatch !== null) {
|
|
out.isIcann = rulesMatch.isIcann;
|
|
out.isPrivate = rulesMatch.isPrivate;
|
|
out.publicSuffix = hostnameParts.slice(rulesMatch.index).join('.');
|
|
return;
|
|
}
|
|
// No match found...
|
|
// Prevailing rule is '*' so we consider the top-level domain to be the
|
|
// public suffix of `hostname` (e.g.: 'example.org' => 'org').
|
|
out.isIcann = false;
|
|
out.isPrivate = false;
|
|
out.publicSuffix = (_a = hostnameParts[hostnameParts.length - 1]) !== null && _a !== void 0 ? _a : null;
|
|
}
|
|
//# sourceMappingURL=suffix-trie.js.map
|