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.
127 lines
3.6 KiB
JavaScript
127 lines
3.6 KiB
JavaScript
const DEFAULT_TIMEOUT = 6e4;
|
|
function defaultSerialize(i) {
|
|
return i;
|
|
}
|
|
const defaultDeserialize = defaultSerialize;
|
|
const { clearTimeout, setTimeout } = globalThis;
|
|
const random = Math.random.bind(Math);
|
|
function createBirpc(functions, options) {
|
|
const {
|
|
post,
|
|
on,
|
|
off = () => {
|
|
},
|
|
eventNames = [],
|
|
serialize = defaultSerialize,
|
|
deserialize = defaultDeserialize,
|
|
resolver,
|
|
bind = "rpc",
|
|
timeout = DEFAULT_TIMEOUT
|
|
} = options;
|
|
const rpcPromiseMap = /* @__PURE__ */ new Map();
|
|
let _promise;
|
|
let closed = false;
|
|
const rpc = new Proxy({}, {
|
|
get(_, method) {
|
|
if (method === "$functions")
|
|
return functions;
|
|
if (method === "$close")
|
|
return close;
|
|
if (method === "then" && !eventNames.includes("then") && !("then" in functions))
|
|
return void 0;
|
|
const sendEvent = (...args) => {
|
|
post(serialize({ m: method, a: args, t: "q" }));
|
|
};
|
|
if (eventNames.includes(method)) {
|
|
sendEvent.asEvent = sendEvent;
|
|
return sendEvent;
|
|
}
|
|
const sendCall = async (...args) => {
|
|
if (closed)
|
|
throw new Error(`[birpc] rpc is closed, cannot call "${method}"`);
|
|
if (_promise) {
|
|
try {
|
|
await _promise;
|
|
} finally {
|
|
_promise = void 0;
|
|
}
|
|
}
|
|
return new Promise((resolve, reject) => {
|
|
const id = nanoid();
|
|
let timeoutId;
|
|
if (timeout >= 0) {
|
|
timeoutId = setTimeout(() => {
|
|
try {
|
|
options.onTimeoutError?.(method, args);
|
|
throw new Error(`[birpc] timeout on calling "${method}"`);
|
|
} catch (e) {
|
|
reject(e);
|
|
}
|
|
rpcPromiseMap.delete(id);
|
|
}, timeout);
|
|
if (typeof timeoutId === "object")
|
|
timeoutId = timeoutId.unref?.();
|
|
}
|
|
rpcPromiseMap.set(id, { resolve, reject, timeoutId, method });
|
|
post(serialize({ m: method, a: args, i: id, t: "q" }));
|
|
});
|
|
};
|
|
sendCall.asEvent = sendEvent;
|
|
return sendCall;
|
|
}
|
|
});
|
|
function close() {
|
|
closed = true;
|
|
rpcPromiseMap.forEach(({ reject, method }) => {
|
|
reject(new Error(`[birpc] rpc is closed, cannot call "${method}"`));
|
|
});
|
|
rpcPromiseMap.clear();
|
|
off(onMessage);
|
|
}
|
|
async function onMessage(data, ...extra) {
|
|
const msg = deserialize(data);
|
|
if (msg.t === "q") {
|
|
const { m: method, a: args } = msg;
|
|
let result, error;
|
|
const fn = resolver ? resolver(method, functions[method]) : functions[method];
|
|
if (!fn) {
|
|
error = new Error(`[birpc] function "${method}" not found`);
|
|
} else {
|
|
try {
|
|
result = await fn.apply(bind === "rpc" ? rpc : functions, args);
|
|
} catch (e) {
|
|
error = e;
|
|
}
|
|
}
|
|
if (msg.i) {
|
|
if (error && options.onError)
|
|
options.onError(error, method, args);
|
|
post(serialize({ t: "s", i: msg.i, r: result, e: error }), ...extra);
|
|
}
|
|
} else {
|
|
const { i: ack, r: result, e: error } = msg;
|
|
const promise = rpcPromiseMap.get(ack);
|
|
if (promise) {
|
|
clearTimeout(promise.timeoutId);
|
|
if (error)
|
|
promise.reject(error);
|
|
else
|
|
promise.resolve(result);
|
|
}
|
|
rpcPromiseMap.delete(ack);
|
|
}
|
|
}
|
|
_promise = on(onMessage);
|
|
return rpc;
|
|
}
|
|
const urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
|
|
function nanoid(size = 21) {
|
|
let id = "";
|
|
let i = size;
|
|
while (i--)
|
|
id += urlAlphabet[random() * 64 | 0];
|
|
return id;
|
|
}
|
|
|
|
export { createBirpc as c };
|