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.
85 lines
2.6 KiB
JavaScript
85 lines
2.6 KiB
JavaScript
/*
|
|
MIT License http://www.opensource.org/licenses/mit-license.php
|
|
Author Tobias Koppers @sokra
|
|
*/
|
|
|
|
"use strict";
|
|
|
|
/** @typedef {import("./Resolver")} Resolver */
|
|
/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
|
|
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
|
|
|
|
module.exports = class ParsePlugin {
|
|
/**
|
|
* @param {string | ResolveStepHook} source source
|
|
* @param {Partial<ResolveRequest>} requestOptions request options
|
|
* @param {string | ResolveStepHook} target target
|
|
*/
|
|
constructor(source, requestOptions, target) {
|
|
this.source = source;
|
|
this.requestOptions = requestOptions;
|
|
this.target = target;
|
|
}
|
|
|
|
/**
|
|
* @param {Resolver} resolver the resolver
|
|
* @returns {void}
|
|
*/
|
|
apply(resolver) {
|
|
const target = resolver.ensureHook(this.target);
|
|
const { requestOptions } = this;
|
|
resolver
|
|
.getHook(this.source)
|
|
.tapAsync("ParsePlugin", (request, resolveContext, callback) => {
|
|
const parsed = resolver.parse(/** @type {string} */ (request.request));
|
|
/** @type {ResolveRequest} */
|
|
// Single spread + direct field assignment instead of
|
|
// `{ ...request, ...parsed, ...requestOptions }` — avoids
|
|
// two extra property enumerations on every resolve.
|
|
// Keep in sync with Resolver.parse() output shape.
|
|
const obj = { ...request };
|
|
obj.request = parsed.request;
|
|
obj.query = parsed.query || request.query || "";
|
|
obj.fragment = parsed.fragment || request.fragment || "";
|
|
obj.module = parsed.module;
|
|
obj.directory = parsed.directory;
|
|
obj.file = parsed.file;
|
|
obj.internal = parsed.internal;
|
|
Object.assign(obj, requestOptions);
|
|
if (parsed && resolveContext.log) {
|
|
if (parsed.module) resolveContext.log("Parsed request is a module");
|
|
if (parsed.directory) {
|
|
resolveContext.log("Parsed request is a directory");
|
|
}
|
|
}
|
|
// There is an edge-case where a request with # can be a path or a fragment -> try both
|
|
if (obj.request && !obj.query && obj.fragment) {
|
|
const directory = obj.fragment.endsWith("/");
|
|
/** @type {ResolveRequest} */
|
|
const alternative = {
|
|
...obj,
|
|
directory,
|
|
request:
|
|
obj.request +
|
|
(obj.directory ? "/" : "") +
|
|
(directory ? obj.fragment.slice(0, -1) : obj.fragment),
|
|
fragment: "",
|
|
};
|
|
resolver.doResolve(
|
|
target,
|
|
alternative,
|
|
null,
|
|
resolveContext,
|
|
(err, result) => {
|
|
if (err) return callback(err);
|
|
if (result) return callback(null, result);
|
|
resolver.doResolve(target, obj, null, resolveContext, callback);
|
|
},
|
|
);
|
|
return;
|
|
}
|
|
resolver.doResolve(target, obj, null, resolveContext, callback);
|
|
});
|
|
}
|
|
};
|