@orangeworks/orangetree 0.4.2 → 0.4.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @orangeworks/orangetree
 
+## 0.4.3
+
+### Patch Changes
+
+- 7a30bbb: Pairing a PC from the app now makes it reachable from the cloud right away. Previously, pairing a freshly launched app left it unreachable — opening it from the cloud dashboard showed a 404 — until the app was manually restarted. The app now relaunches itself automatically to finish connecting.
+
 ## 0.4.2
 
 ### Patch Changes

package/dist/public/i18n.js

@@ -34,7 +34,7 @@ const ko = {
   "pair.provisioning": "PC\uB97C \uC900\uBE44\uD558\uB294 \uC911",
   "pair.paired.title": "\uC5F0\uACB0 \uC644\uB8CC!",
   "pair.paired.url": "\uC811\uC18D \uC8FC\uC18C",
-  "pair.paired.restart": "\uC791\uC5C5 \uD3F4\uB354 \uBCF4\uD638\uB97C \uC644\uC804\uD788 \uC801\uC6A9\uD558\uB824\uBA74 \uC571\uC744 \uC7AC\uC2DC\uC791\uD558\uC138\uC694.",
+  "pair.paired.restart": "\uD074\uB77C\uC6B0\uB4DC \uC5F0\uACB0\uC744 \uC801\uC6A9\uD558\uB824\uACE0 \uC571\uC744 \uB2E4\uC2DC \uC2DC\uC791\uD558\uB294 \uC911\uC785\uB2C8\uB2E4. \uC7A0\uC2DC \uD6C4 \uB300\uC2DC\uBCF4\uB4DC\uC758 \u201C\uC5F0\uACB0 PC\u201D\uC5D0\uC11C \uC5F4\uC5B4 \uC8FC\uC138\uC694.",
   "pair.retry": "\uB2E4\uC2DC \uC2DC\uB3C4",
   "pair.start.fail": "\uC5F0\uACB0\uC744 \uC2DC\uC791\uD558\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4.",
   "pair.failed.denied": "\uC2B9\uC778\uC774 \uAC70\uBD80\uB418\uC5C8\uC2B5\uB2C8\uB2E4.",
@@ -338,7 +338,7 @@ const en = {
   "pair.provisioning": "Preparing your PC",
   "pair.paired.title": "Connected!",
   "pair.paired.url": "Access URL",
-  "pair.paired.restart": "Restart the app to fully apply work-folder protection.",
+  "pair.paired.restart": "Restarting the app to apply the cloud connection \u2014 open this PC from the dashboard in a moment.",
   "pair.retry": "Try again",
   "pair.start.fail": "Could not start the connection.",
   "pair.failed.denied": "The request was denied.",
@@ -638,7 +638,7 @@ const ja = {
   "pair.provisioning": "PC\u3092\u6E96\u5099\u4E2D",
   "pair.paired.title": "\u63A5\u7D9A\u5B8C\u4E86\uFF01",
   "pair.paired.url": "\u30A2\u30AF\u30BB\u30B9URL",
-  "pair.paired.restart": "\u4F5C\u696D\u30D5\u30A9\u30EB\u30C0\u4FDD\u8B77\u3092\u5B8C\u5168\u306B\u9069\u7528\u3059\u308B\u306B\u306F\u30A2\u30D7\u30EA\u3092\u518D\u8D77\u52D5\u3057\u3066\u304F\u3060\u3055\u3044\u3002",
+  "pair.paired.restart": "\u30AF\u30E9\u30A6\u30C9\u63A5\u7D9A\u3092\u9069\u7528\u3059\u308B\u305F\u3081\u306B\u30A2\u30D7\u30EA\u3092\u518D\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059\u3002\u5C11\u3057\u5F85\u3063\u3066\u304B\u3089\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u3067\u3053\u306EPC\u3092\u958B\u3044\u3066\u304F\u3060\u3055\u3044\u3002",
   "pair.retry": "\u518D\u8A66\u884C",
   "pair.start.fail": "\u63A5\u7D9A\u3092\u958B\u59CB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002",
   "pair.failed.denied": "\u627F\u8A8D\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F\u3002",

package/dist/server.js

@@ -8,6 +8,7 @@ var __export = (target, all) => {
 import { createServer as createServer2 } from "node:http";
 import { readFile, readdir, writeFile, mkdir as mkdir2 } from "node:fs/promises";
 import { randomUUID as randomUUID2 } from "node:crypto";
+import { spawn as spawn2 } from "node:child_process";
 import { existsSync as existsSync9, readFileSync as readFileSync4 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
 import { join as join9, extname, normalize as normalize5, basename as basename3, dirname as dirname6, relative as relative3, isAbsolute as isAbsolute3, sep as sep2 } from "node:path";
@@ -17548,7 +17549,7 @@ var PairingManager = class {
       if (this.gen !== gen) return;
       const exchanged = await exchangeOnboardingToken(this.cloudBase, onboardingToken);
       if (this.gen !== gen) return;
-      await this.onPaired({
+      const needsRestart = await this.onPaired({
         credentials: exchanged.credentials,
         otreeToken: exchanged.otreeToken,
         recordId: pc.recordId,
@@ -17556,7 +17557,7 @@ var PairingManager = class {
       });
       if (this.gen !== gen) return;
       this.sessionToken = null;
-      this.state = { phase: "paired", accessUrl: pc.accessUrl, needsRestart: true };
+      this.state = { phase: "paired", accessUrl: pc.accessUrl, needsRestart };
     } catch (err) {
       if (this.gen !== gen) return;
       this.sessionToken = null;
@@ -17862,6 +17863,31 @@ async function startNewt(upstreamPort) {
     newtStarting = false;
   }
 }
+var relaunching = false;
+function relaunch() {
+  if (relaunching) return;
+  relaunching = true;
+  console.log("[pair] config changed \u2014 relaunching to apply cloud remote mode.");
+  let spawned = false;
+  const spawnChild = () => {
+    if (spawned) return;
+    spawned = true;
+    const env = { ...process.env };
+    for (const k of ["OTREE_ROOT", "OTREE_REMOTE_AUTH", "OTREE_CLOUD_API", "OTREE_BIND", "OTREE_OPEN"]) {
+      delete env[k];
+    }
+    env.OTREE_PORT = String(resolvedPort || PORT);
+    const child = spawn2(process.execPath, process.argv.slice(1), { detached: true, stdio: "inherit", env });
+    child.unref();
+    setTimeout(() => process.exit(0), 100);
+  };
+  void (newtManager?.stop() ?? Promise.resolve()).finally(() => {
+    newtManager = null;
+    server.close(spawnChild);
+    server.closeAllConnections();
+    setTimeout(spawnChild, 2e3).unref();
+  });
+}
 function cloudApiBase() {
   const v = process.env.OTREE_CLOUD_API?.trim();
   return v && /^https?:\/\//i.test(v) ? v : null;
@@ -17891,6 +17917,11 @@ async function onPaired(r) {
     workRoot,
     pairing: { onboardingToken: null, consumedAt: Date.now() }
   });
+  const needsRestart = !remoteSession || pairingCloudBase() !== remoteCfg.cloudApiBase;
+  if (needsRestart) {
+    setTimeout(() => relaunch(), 2500);
+    return true;
+  }
   if (remoteCfg.mode === "remote") {
     if (r.otreeToken && !remoteCfg.tokenRequired) {
       remoteCfg.token = r.otreeToken;
@@ -17902,6 +17933,7 @@ async function onPaired(r) {
     }
     void startNewt(resolvedPort);
   }
+  return false;
 }
 var pairingManager = new PairingManager(
   pairingCloudBase(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orangeworks/orangetree",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Branching session-tree work-tracking tool (local-first, TypeScript)",
   "author": "OrangeWorks <support@orangeworks.kr>",
   "repository": {