@runeya/runeya 2.0.83 → 2.0.84

package/index.js

@@ -279,7 +279,7 @@ async function main() {
   ensureNodeBinOnPath();
   await ensureUserBinsOnPath();
   if (!isPullEnv) stampConsole();
-  const { createLocalServer, pullEnv, PullEnvError, registerInstance } = await import("./src-OHWIFAND.js");
+  const { createLocalServer, pullEnv, PullEnvError, registerInstance } = await import("./src-BWQ4J4D5.js");
   if (isPullEnv) {
     if (!serviceArg) {
       console.error("Error: --service (-s) is required with --pull-env");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runeya/runeya",
-  "version": "2.0.83",
+  "version": "2.0.84",
   "type": "module",
   "bin": {
     "runeya": "./index.js"

package/{src-OHWIFAND.js → src-BWQ4J4D5.js}

@@ -7702,13 +7702,23 @@ function getDeviceName() {
   const suffix = dir && dir !== ".runeya" ? ` \xB7 ${dir}` : "";
   return `${host}${suffix}`.slice(0, 64);
 }
-function isLocalOrigin(url) {
+function callbackForReturnTo(url) {
+  let parsed;
   try {
-    const { protocol, hostname: hostname2 } = new URL(url);
-    return (protocol === "http:" || protocol === "https:") && (hostname2 === "localhost" || hostname2 === "127.0.0.1" || hostname2 === "[::1]");
+    parsed = new URL(url);
   } catch {
-    return false;
+    return null;
+  }
+  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return null;
+  const { hostname: hostname2, port } = parsed;
+  if (hostname2 === "localhost" || hostname2 === "127.0.0.1" || hostname2 === "[::1]") {
+    return `http://127.0.0.1:${env.PORT}/api/cloud/callback`;
   }
+  if (!env.RUNEYA_LAN_PROXY) return null;
+  const effectivePort = port || (parsed.protocol === "https:" ? "443" : "80");
+  if (effectivePort !== String(env.PORT)) return null;
+  if (!lanIps().includes(hostname2)) return null;
+  return `${parsed.origin}/api/cloud/callback`;
 }
 async function cloudFetch2(path, init = {}) {
   try {
@@ -7727,11 +7737,14 @@ function isAllowedProxyPath(path) {
 var cloudAuthRouter = router({
   /** Build the cloud authorization URL to open in the browser. */
   startLogin: protectedProcedure.input(z16.object({ returnTo: z16.string().url().max(2048) })).mutation(async ({ input }) => {
-    if (!isLocalOrigin(input.returnTo)) {
-      throw new TRPCError11({ code: "BAD_REQUEST", message: "returnTo must be a local origin." });
+    const callback = callbackForReturnTo(input.returnTo);
+    if (!callback) {
+      throw new TRPCError11({
+        code: "BAD_REQUEST",
+        message: env.RUNEYA_LAN_PROXY ? "returnTo must be this machine, on the server port." : "returnTo must be a local origin."
+      });
     }
     const state = cloudSessionStore.createState(input.returnTo);
-    const callback = `http://127.0.0.1:${env.PORT}/api/cloud/callback`;
     const url = `${getCloudAppUrl()}/link-local?callback=${encodeURIComponent(callback)}&state=${encodeURIComponent(state)}`;
     return { url };
   }),
@@ -18253,4 +18266,4 @@ export {
   pullEnv,
   registerInstance
 };
-//# sourceMappingURL=src-OHWIFAND.js.map
+//# sourceMappingURL=src-BWQ4J4D5.js.map