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.
126 lines
3.6 KiB
JavaScript
126 lines
3.6 KiB
JavaScript
"use strict";
|
|
|
|
const xnv = require("xml-name-validator");
|
|
|
|
const { NAMESPACES } = require("./constants");
|
|
|
|
function generatePrefix(map, newNamespace, prefixIndex) {
|
|
const generatedPrefix = `ns${prefixIndex}`;
|
|
map[newNamespace] = [generatedPrefix];
|
|
return generatedPrefix;
|
|
}
|
|
|
|
function preferredPrefixString(map, ns, preferredPrefix) {
|
|
const candidateList = map[ns];
|
|
if (!candidateList) {
|
|
return null;
|
|
}
|
|
if (candidateList.includes(preferredPrefix)) {
|
|
return preferredPrefix;
|
|
}
|
|
return candidateList[candidateList.length - 1];
|
|
}
|
|
|
|
function serializeAttributeValue(value/* , requireWellFormed*/) {
|
|
if (value === null) {
|
|
return "";
|
|
}
|
|
// TODO: Check well-formedness
|
|
return value
|
|
.replace(/&/ug, "&")
|
|
.replace(/"/ug, """)
|
|
.replace(/</ug, "<")
|
|
.replace(/>/ug, ">")
|
|
.replace(/\t/ug, "	")
|
|
.replace(/\n/ug, "
")
|
|
.replace(/\r/ug, "
");
|
|
}
|
|
|
|
function serializeAttributes(
|
|
element,
|
|
map,
|
|
localPrefixes,
|
|
ignoreNamespaceDefAttr,
|
|
requireWellFormed,
|
|
refs
|
|
) {
|
|
let result = "";
|
|
const namespaceLocalnames = Object.create(null);
|
|
for (const attr of element.attributes) {
|
|
if (
|
|
requireWellFormed &&
|
|
namespaceLocalnames[attr.namespaceURI] &&
|
|
namespaceLocalnames[attr.namespaceURI].has(attr.localName)
|
|
) {
|
|
throw new Error("Found duplicated attribute");
|
|
}
|
|
if (!namespaceLocalnames[attr.namespaceURI]) {
|
|
namespaceLocalnames[attr.namespaceURI] = new Set();
|
|
}
|
|
namespaceLocalnames[attr.namespaceURI].add(attr.localName);
|
|
const attributeNamespace = attr.namespaceURI;
|
|
let candidatePrefix = null;
|
|
if (attributeNamespace !== null) {
|
|
candidatePrefix = preferredPrefixString(
|
|
map,
|
|
attributeNamespace,
|
|
attr.prefix
|
|
);
|
|
if (attributeNamespace === NAMESPACES.XMLNS) {
|
|
if (
|
|
attr.value === NAMESPACES.XML ||
|
|
(attr.prefix === null && ignoreNamespaceDefAttr) ||
|
|
(attr.prefix !== null &&
|
|
localPrefixes[attr.localName] !== attr.value &&
|
|
map[attr.value].includes(attr.localName))
|
|
) {
|
|
continue;
|
|
}
|
|
if (requireWellFormed && attr.value === NAMESPACES.XMLNS) {
|
|
throw new Error(
|
|
"The XMLNS namespace is reserved and cannot be applied as an element's namespace via XML parsing"
|
|
);
|
|
}
|
|
if (requireWellFormed && attr.value === "") {
|
|
throw new Error(
|
|
"Namespace prefix declarations cannot be used to undeclare a namespace"
|
|
);
|
|
}
|
|
if (attr.prefix === "xmlns") {
|
|
candidatePrefix = "xmlns";
|
|
}
|
|
} else if (candidatePrefix === null) {
|
|
candidatePrefix = generatePrefix(
|
|
map,
|
|
attributeNamespace,
|
|
refs.prefixIndex++
|
|
);
|
|
result += ` xmlns:${candidatePrefix}="${serializeAttributeValue(
|
|
attributeNamespace,
|
|
requireWellFormed
|
|
)}"`;
|
|
}
|
|
}
|
|
|
|
result += " ";
|
|
if (candidatePrefix !== null) {
|
|
result += `${candidatePrefix}:`;
|
|
}
|
|
if (
|
|
requireWellFormed &&
|
|
(attr.localName.includes(":") ||
|
|
!xnv.name(attr.localName) ||
|
|
(attr.localName === "xmlns" && attributeNamespace === null))
|
|
) {
|
|
throw new Error("Invalid attribute localName value");
|
|
}
|
|
result += `${attr.localName}="${serializeAttributeValue(attr.value, requireWellFormed)}"`;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
module.exports.preferredPrefixString = preferredPrefixString;
|
|
module.exports.generatePrefix = generatePrefix;
|
|
module.exports.serializeAttributeValue = serializeAttributeValue;
|
|
module.exports.serializeAttributes = serializeAttributes;
|