acrylblends 0.6.0 → 0.6.2

package/plugins/desktop-web/user-data.ts

@@ -0,0 +1,38 @@
+/** Electron user-data location for isolated local launches: an explicit override, else the selected app instance's own folder. */
+
+import { join, resolve } from 'node:path'
+
+/** Env var consumed by the Electron bootstrap before the single-instance lock. */
+export const DSH_DESKTOP_USER_DATA_ENV = 'DSH_DESKTOP_USER_DATA'
+
+/** What the selected app instance says about where its Electron user data lives (see `AppInstance.userDataName`). */
+export interface InstanceUserData {
+  /**
+   * The platform's application-data folder (`app.getPath('appData')`). A function because it is asked only when it is needed: Electron throws for it on
+   * Windows when the user profile is redirected (an isolated run moves USERPROFILE), and an explicit `DSH_DESKTOP_USER_DATA` makes it unnecessary.
+   */
+  readonly appData: () => string
+  /** The instance's user-data folder name. */
+  readonly userDataName: string
+  /** The name Electron would otherwise derive the folder from. */
+  readonly productName: string
+}
+
+/**
+ * Resolve a launch-time user-data directory from the environment.
+ * An explicit `DSH_DESKTOP_USER_DATA` wins; empty or whitespace-only values are treated as unset so a blank override never points Electron at the
+ * current working directory. Without one, an instance whose `userDataName` differs from the product name (a worktree, the development app, a launch
+ * with `ACRYL_LOCAL_PRODUCT_NAME`) gets its own folder under the application-data folder, so it never shares window state, logs, crash evidence or
+ * the single-instance lock with the installed app. The default instance names its folder after the product, so it is left alone.
+ * @param env - process environment, injected in tests.
+ * @param instance - the selected instance's user-data facts, when the caller has them.
+ */
+export function resolveDesktopUserDataOverride(
+  env: Record<string, string | undefined> = process.env,
+  instance?: InstanceUserData,
+): string | undefined {
+  const raw = env[DSH_DESKTOP_USER_DATA_ENV]
+  if (raw !== undefined && raw.trim().length > 0) return resolve(raw)
+  if (instance === undefined || instance.userDataName === instance.productName) return undefined
+  return join(instance.appData(), instance.userDataName)
+}

package/plugins/desktop-web/window.ts

@@ -0,0 +1,29 @@
+/** The one window of a desktop app: the operating system's frame around a page the app's own server serves, with the renderer locked down. */
+import type { BrowserWindowConstructorOptions } from 'electron'
+
+export interface WindowSpec {
+  readonly title: string
+  readonly width?: number
+  readonly height?: number
+}
+
+/**
+ * Secure BrowserWindow options. The settings are ACRYL Desktop's: context isolation on, no Node in the page, the sandbox on, web security on; the window stays
+ * hidden until the page has painted (`show: false`, shown on `ready-to-show`).
+ */
+export function windowOptions(spec: WindowSpec): BrowserWindowConstructorOptions {
+  return {
+    title: spec.title,
+    width: spec.width ?? 1100,
+    height: spec.height ?? 760,
+    minWidth: 480,
+    minHeight: 360,
+    show: false,
+    webPreferences: {
+      contextIsolation: true,
+      nodeIntegration: false,
+      sandbox: true,
+      webSecurity: true,
+    },
+  }
+}

package/plugins/tsconfig.json

@@ -17,6 +17,8 @@
   "exclude": [
     "desktop/main.ts",
     "desktop/window.ts",
+    "desktop-web/main.ts",
+    "desktop-web/window.ts",
     "acryl-*/src/**/*.test.ts",
     "acryl-*/src/**/*.case.ts",
     "acryl-node-server/tests/adapter",

package/templates/todo/upstream.json

@@ -5,7 +5,7 @@
       "examples/acryl-todo/src/index.ts": "src/todo.ts",
       "examples/acryl-todo/src/page.ts": "src/page.ts"
     },
-    "commit": "5743482e4199ded676a77f594bce15fd4aa0ca2f"
+    "commit": "0174cb01625bfd32d0162ad56179c582f353321e"
   },
   "rewrittenSpecifiers": 4,
   "digest": "sha256:9093704776563001f7f472f94cc5c2fdd79206342c1cb59c11fce62aa74df3ed"