@omega.js/desktop 0.52.0 → 0.53.0

package/dist/test/suites/build/renderer-auth-bridge.test.js

@@ -1,89 +1,128 @@
-// Build-layer tests for renderer.js's auth bridge (_wireAuthBridge).
+// Build-layer tests for the renderer's auth bridge (`_wireAuthBridge`) against
+// main's REAL lib/auth.js handlers.
 //
-// The bridge is pure JS — ipc in, ipc out, no DOM — so it runs in plain Node here
-// against the REAL @omega.js/client Auth class (a renderer-layer suite can't: those
-// bodies run inside a BrowserWindow with no require).
+// The bridge is pure JS (ipc in, ipc out, no DOM), so it runs in plain Node here on
+// a REAL renderer instance, the @omega.js/client base class included (a renderer-
+// layer suite can't: those bodies run inside a BrowserWindow with no require).
 //
-// What's pinned: the sync-request payload carries the signed-in UID. The renderer
-// reads it from the client's auth handle, whose accessor is `getUser()` — an
-// accessor-name drift here is silent (optional chain → undefined → contextUid null),
-// which is exactly how #103 shipped: every renderer boot claimed "signed out" and
-// forced main into a full custom-token round-trip it could have skipped.
+// What's pinned:
+//   - the sync-request payload carries the signed-in UID, read off the client's
+//     Firebase session. A drift here is silent (null → "signed out"), which is
+//     exactly how #103 shipped: every renderer boot claimed "signed out" and forced
+//     main into a full custom-token round-trip it could have skipped.
+//   - every signed-in state pushes `{ uid, document, identity }` to main, and main
+//     builds its `auth.user` from that WHOLE document, so its plan reads from it.
+//   - the `omega-signin` / `omega-account` click triggers the extension's pages
+//     carry route to main's open-flow / open-account channels. Pinned here, not in
+//     a renderer-layer page: a real click would open the user's browser.
+//   - the client's `omega-signout` trigger routes to main's sign-out channel, and
+//     the window signs itself out only on main's broadcast.
+//
+// Two seams, both named: the backend (`omega.request`, whose wakeup would reach the
+// network) and the client's auth state source (`omega.auth.listen`), because a
+// real signed-in renderer needs the auth emulator, which the e2e-desktop lane drives.
 
 const path = require('path');
 
+const { User } = require('../../../vendor/account/index.js');
 const { WAKEUP_ROUTE } = require('@omega.js/client/modules/request.js');
 const defineCases = require('../../../vendor/devkit/test/define-cases.js');
 
-const RENDERER_PATH = path.join(__dirname, '..', '..', '..', 'renderer.js');
-const CLIENT_BRIDGE_PATH = path.join(__dirname, '..', '..', '..', 'lib', 'client-bridge.js');
-
-// The real client Auth, wired to a manager stub whose firebaseAuth reports `user`.
-// `_resolveFirebaseConfig` returns an apiKey-less blob so listen() settles immediately
-// with a null user instead of hanging on a Firebase that isn't there.
-async function makeClientAuth(user) {
-  const { default: Auth } = await import('@omega.js/client/modules/auth.js');
-  return new Auth({
-    firebaseAuth: { currentUser: user },
-    _resolveFirebaseConfig: () => ({}),
-  });
-}
+const ROOT = path.join(__dirname, '..', '..', '..');
+const mainAuth = require(path.join(ROOT, 'lib', 'auth.js'));
+
+// A signed-in renderer's account: the stored document with an active paid plan
+const IDENTITY = { uid: 'uid-abc', email: 'a@b.co', displayName: 'Abc', photoURL: 'https://example.com/a.png', emailVerified: true };
+const DOCUMENT = { subscription: { product: { id: 'premium' }, status: 'active' } };
 
-// A renderer Manager with the client already booted and an ipc stub whose invoke
-// answers are supplied by `handle`. Returns the manager, the recorded invokes,
-// the recorded backend requests, and the `timeline` of both in the order the
-// bridge produced them — the wakeup ping's whole point is that it is FIRST.
-function makeRenderer(auth, handle) {
-  const Manager = require(RENDERER_PATH);
-  const manager = new Manager();
+/**
+ * A fresh renderer instance on a recording bridge. `handle(channel, payload)`
+ * answers each ipc.invoke. Returns the instance, the recorded invokes and
+ * backend requests, the `timeline` of both in the order the bridge produced
+ * them (the wakeup ping's whole point is that it is FIRST), and `deliver`, the
+ * client's auth listener the bridge registered.
+ * @param {{ uid: string }|null} firebaseUser - the client's Firebase session user.
+ * @param {Function} handle - the ipc.invoke answerer.
+ * @returns {object} the renderer and its recordings.
+ */
+function makeRenderer(firebaseUser, handle) {
   const invokes = [];
   const requests = [];
   const timeline = [];
+  const listeners = [];
 
-  manager.ipc = {
-    on: () => {},
-    invoke: async (channel, payload) => {
-      invokes.push({ channel, payload });
-      timeline.push(channel);
-      return handle(channel, payload);
+  const desktop = {
+    ipc: {
+      on: () => () => {},
+      invoke: async (channel, payload) => {
+        invokes.push({ channel, payload });
+        timeline.push(channel);
+        return handle(channel, payload);
+      },
     },
   };
-  manager.omega = {
-    auth: () => auth,
-    request: async (url, options = {}) => {
-      requests.push({ url, options });
-      timeline.push(options.wakeup ? 'wakeup' : url);
-    },
+
+  const saved = globalThis.window;
+  globalThis.window = { desktop };
+  let omega;
+  try {
+    const { Omega } = require(path.join(ROOT, 'renderer.js'));
+    omega = new Omega();
+  } finally {
+    if (saved === undefined) delete globalThis.window;
+    else globalThis.window = saved;
+  }
+
+  // The client's Firebase session, as its `firebaseAuth` getter reads it
+  omega._firebaseAuth = { currentUser: firebaseUser };
+  omega.request = async (url, options = {}) => {
+    requests.push({ url, options });
+    timeline.push(options.wakeup ? 'wakeup' : url);
   };
+  omega.auth.listen = (callback) => {
+    listeners.push(callback);
+    return () => {};
+  };
+
+  const deliver = (state) => listeners.forEach((callback) => callback(state));
 
-  return { manager, invokes, requests, timeline };
+  return { omega, invokes, requests, timeline, deliver };
+}
+
+/**
+ * A click inside an element carrying `className`, handed to the registry's one
+ * delegated listener. closest() answers only when the registry's selector names
+ * that class, so the class is the registered one.
+ * @param {object} omega - the renderer instance.
+ * @param {string} className - the trigger class clicked.
+ */
+function clickTrigger(omega, className) {
+  omega.triggers._handleClick({
+    target: {
+      closest: (selector) => (selector.split(',').includes(`.${className}`)
+        ? { classList: { contains: (name) => name === className } }
+        : null),
+    },
+    preventDefault: () => {},
+    stopPropagation: () => {},
+  });
 }
 
 module.exports = defineCases({
   type: 'suite',
   layer: 'build',
-  description: 'renderer auth bridge — sync-request context UID',
+  description: 'renderer auth bridge: sync-request context UID + the account push main builds its user from',
   tests: [
-    {
-      name: 'the client auth handle exposes getUser() (and no user() accessor)',
-      run: async (ctx) => {
-        const auth = await makeClientAuth({ uid: 'uid-abc', email: 'a@b.co' });
-        ctx.expect(typeof auth.getUser).toBe('function');
-        ctx.expect(auth.getUser().uid).toBe('uid-abc');
-        ctx.expect(auth.user).toBeUndefined();
-      },
-    },
     {
       // #644: main answers a sync-request that needs a token by POSTing
-      // /omega/user/token — the app's first backend call, on a function that is
+      // /omega/user/token, the app's first backend call, on a function that is
       // cold at every launch. The ping goes out before the bridge waits on
       // anything, so the cold start burns down while auth settles.
       name: 'the bridge warms the backend first, then syncs',
       run: async (ctx) => {
-        const auth = await makeClientAuth({ uid: 'uid-abc', email: 'a@b.co' });
-        const { manager, requests, timeline } = makeRenderer(auth, () => ({ needsSync: false }));
+        const { omega, requests, timeline } = makeRenderer({ uid: 'uid-abc' }, () => ({ needsSync: false }));
 
-        await manager._wireAuthBridge();
+        await omega._wireAuthBridge();
 
         ctx.expect(requests.length).toBe(1);
         ctx.expect(requests[0].url).toBe(WAKEUP_ROUTE);
@@ -95,10 +134,9 @@ module.exports = defineCases({
     {
       name: 'sync-request carries the signed-in UID as contextUid',
       run: async (ctx) => {
-        const auth = await makeClientAuth({ uid: 'uid-abc', email: 'a@b.co' });
-        const { manager, invokes } = makeRenderer(auth, () => ({ needsSync: false }));
+        const { omega, invokes } = makeRenderer({ uid: 'uid-abc' }, () => ({ needsSync: false }));
 
-        await manager._wireAuthBridge();
+        await omega._wireAuthBridge();
 
         const sync = invokes.find((i) => i.channel === 'desktop:auth:sync-request');
         ctx.expect(sync).toBeDefined();
@@ -108,49 +146,144 @@ module.exports = defineCases({
     {
       name: 'sync-request carries null when nobody is signed in',
       run: async (ctx) => {
-        const auth = await makeClientAuth(null);
-        const { manager, invokes } = makeRenderer(auth, () => ({ needsSync: false }));
+        const { omega, invokes } = makeRenderer(null, () => ({ needsSync: false }));
 
-        await manager._wireAuthBridge();
+        await omega._wireAuthBridge();
 
         const sync = invokes.find((i) => i.channel === 'desktop:auth:sync-request');
         ctx.expect(sync.payload.contextUid).toBeNull();
       },
     },
     {
-      name: 'matching UIDs short-circuit against the real main-side handler — no token round-trip',
+      name: 'matching UIDs short-circuit against the real main-side handler: no token round-trip',
       run: async (ctx) => {
-        // Main's side is the REAL client-bridge handler with its auth stubbed to the
+        // Main's side is the REAL lib/auth.js handler with its session stubbed to the
         // same user; the only thing under test is whether the renderer's claim matches.
-        const bridge = require(CLIENT_BRIDGE_PATH);
-        const origAuth = bridge._firebaseAuth;
-        bridge._firebaseAuth = { currentUser: { uid: 'uid-abc' } };
+        const origAuth = mainAuth._firebaseAuth;
+        mainAuth._firebaseAuth = { currentUser: { uid: 'uid-abc' } };
 
         try {
-          const auth = await makeClientAuth({ uid: 'uid-abc', email: 'a@b.co' });
-          let signIns = 0;
-          let signOuts = 0;
-          auth.signInWithCustomToken = async () => { signIns++; };
-          auth.signOut = async () => { signOuts++; };
-
           let result = null;
-          const { manager } = makeRenderer(auth, async (channel, payload) => {
+          const { omega } = makeRenderer({ uid: 'uid-abc' }, async (channel, payload) => {
             if (channel !== 'desktop:auth:sync-request') return null;
-            result = await bridge._handleSyncRequest(payload.contextUid);
+            result = await mainAuth._handleSyncRequest(payload.contextUid);
             return result;
           });
+          let signIns = 0;
+          let signOuts = 0;
+          omega.auth.signInWithCustomToken = async () => { signIns++; };
+          omega.auth.signOut = async () => { signOuts++; };
 
-          await manager._wireAuthBridge();
+          await omega._wireAuthBridge();
 
           ctx.expect(result.needsSync).toBe(false);
           // The handler's catch ALSO returns needsSync:false (with an error field), so a
-          // null contextUid falling through to the token fetch would pass the line above —
+          // null contextUid falling through to the token fetch would pass the line above;
           // the absent error is what proves the uid match short-circuited.
           ctx.expect(result.error).toBeUndefined();
           ctx.expect(signIns).toBe(0);
           ctx.expect(signOuts).toBe(0);
         } finally {
-          bridge._firebaseAuth = origAuth;
+          mainAuth._firebaseAuth = origAuth;
+        }
+      },
+    },
+    {
+      name: 'the signin and account triggers route a click to main\'s open-flow and open-account channels',
+      run: async (ctx) => {
+        const { omega, invokes } = makeRenderer(null, () => ({ needsSync: false }));
+
+        await omega._wireAuthBridge();
+
+        clickTrigger(omega, 'omega-signin');
+        clickTrigger(omega, 'omega-account');
+
+        const opens = invokes.map((i) => i.channel).filter((channel) => channel.startsWith('desktop:auth:open-'));
+        ctx.expect(opens).toEqual(['desktop:auth:open-flow', 'desktop:auth:open-account']);
+      },
+    },
+    {
+      // The client registers `omega-signout` (the one registration, at
+      // initialize); on desktop it signs MAIN out, and this window's own
+      // sign-out is the broadcast listener's, so nothing signs out twice.
+      // `confirm` is the one seam: Node has no dialog.
+      name: 'the client\'s signout trigger invokes main\'s sign-out channel, and the window does not sign itself out',
+      run: async (ctx) => {
+        const { omega, invokes } = makeRenderer({ uid: 'uid-abc' }, (channel) => (channel === 'desktop:auth:sign-out' ? { success: true } : { needsSync: false }));
+        let localSignOuts = 0;
+        const notices = [];
+        omega.auth.signOut = async () => { localSignOuts++; };
+        omega.utilities.showNotification = (message, type) => notices.push([message, type]);
+
+        await omega._wireAuthBridge();
+        omega.auth.setupEventListeners();
+
+        globalThis.confirm = () => true;
+        try {
+          clickTrigger(omega, 'omega-signout');
+          await new Promise((resolve) => setImmediate(resolve));
+        } finally {
+          delete globalThis.confirm;
+        }
+
+        ctx.expect(invokes.filter((i) => i.channel === 'desktop:auth:sign-out').length).toBe(1);
+        ctx.expect(localSignOuts).toBe(0);
+        ctx.expect(notices).toEqual([['Successfully signed out.', 'success']]);
+      },
+    },
+    {
+      name: 'a signed-out state pushes nothing',
+      run: async (ctx) => {
+        const { omega, invokes, deliver } = makeRenderer(null, () => ({ needsSync: false }));
+
+        await omega._wireAuthBridge();
+        deliver({ user: new User(), denied: false });
+        await Promise.resolve();
+
+        ctx.expect(invokes.some((i) => i.channel === 'desktop:auth:account-resolved')).toBe(false);
+      },
+    },
+    {
+      name: 'a signed-in state pushes { uid, document, identity }, and main\'s auth.user is built from it',
+      run: async (ctx) => {
+        // Main's side is the REAL lib/auth.js intake, on a session holding the same uid
+        const saved = { firebaseAuth: mainAuth._firebaseAuth, omega: mainAuth._omega, user: mainAuth.user, state: mainAuth.state };
+        const broadcasts = [];
+        mainAuth._firebaseAuth = { currentUser: { uid: IDENTITY.uid } };
+        mainAuth._omega = { ipc: { broadcast: (channel, payload) => broadcasts.push({ channel, payload }) } };
+        mainAuth._land(new User());
+
+        try {
+          let pushed = null;
+          const { omega, deliver } = makeRenderer({ uid: IDENTITY.uid }, (channel, payload) => {
+            if (channel === 'desktop:auth:sync-request') return { needsSync: false };
+            if (channel === 'desktop:auth:account-resolved') {
+              pushed = payload;
+              return mainAuth._handleAccountResolved(payload);
+            }
+            return null;
+          });
+
+          await omega._wireAuthBridge();
+          ctx.expect(mainAuth.user.authenticated).toBe(false);
+          ctx.expect(mainAuth.user.plan).toBe('basic');
+
+          const rendererUser = new User(DOCUMENT, IDENTITY);
+          deliver({ user: rendererUser, denied: false });
+          await Promise.resolve();
+
+          ctx.expect(pushed).toEqual({ uid: IDENTITY.uid, document: rendererUser.toJSON(), identity: IDENTITY });
+          ctx.expect(mainAuth.user.uid).toBe(IDENTITY.uid);
+          ctx.expect(mainAuth.user.plan).toBe('premium');
+          ctx.expect(mainAuth.user.active).toBe(true);
+          ctx.expect(mainAuth.user.profile.displayName).toBe('Abc');
+          ctx.expect(mainAuth.user.toJSON()).toEqual(rendererUser.toJSON());
+          ctx.expect(broadcasts).toEqual([{ channel: 'desktop:auth:plan-changed', payload: { document: rendererUser.toJSON() } }]);
+        } finally {
+          mainAuth._firebaseAuth = saved.firebaseAuth;
+          mainAuth._omega = saved.omega;
+          mainAuth.user = saved.user;
+          mainAuth.state = saved.state;
         }
       },
     },

package/dist/test/suites/build/runner.test.js

@@ -565,7 +565,7 @@ module.exports = defineCases({
         const src = fs.readFileSync(path.join(__dirname, '..', '..', '..', 'commands', 'runner.js'), 'utf8');
         ctx.expect(src).toContain('Existing runner installation detected');
         ctx.expect(src).toContain('uninstalling first for a clean re-install');
-        // ...and the electron-manager era's install counts as an existing one.
+        // ...and the legacy em-runner install counts as an existing one.
         ctx.expect(src).toMatch(/jetpack\.exists\(home\)\s*\|\|\s*listLegacyRunnerHomes\(\{ home \}\)\.length > 0/);
       },
     },
@@ -1013,7 +1013,7 @@ module.exports = defineCases({
       },
     },
     {
-      name: 'the electron-manager era homes are found from the environment, never the current home',
+      name: 'the legacy em-runner homes are found from the environment, never the current home',
       run: (ctx) => {
         // An upgraded box still runs `em runner`'s install out of
         // %LOCALAPPDATA%\em-runner (C:\actions-runners before that). Those are

package/dist/test/suites/build/sentry.test.js

@@ -3,7 +3,7 @@
 // The policy itself — config gating, the dev/kill switches, user normalization,
 // release tagging — is @omega.js/monitoring's, proven by its own suite
 // (packages/monitoring/test/). What belongs here is the desktop half: the
-// package entry resolves in a main-process context, the manager's `sentry`
+// package entry resolves in a main-process context, the omega instance's `sentry`
 // surface is the one every lib calls, and a brand with no DSN gets a silent
 // no-op instead of a crash.
 
@@ -47,7 +47,7 @@ module.exports = defineCases({
         try {
           main.captureException(new Error('test'));
           main.captureMessage('test');
-          // client-bridge calls this on every auth change — a documented no-op when off.
+          // lib/auth.js calls this on every auth change, a documented no-op when off.
           main.setUser({ uid: 'abc', email: 'user@example.com' });
         } catch (e) {
           threw = e;

package/dist/test/suites/build/sign-windows-e2e.test.js

@@ -27,7 +27,7 @@ const defineCases = require('../../../vendor/devkit/test/define-cases.js');
 const signerPath = path.join(__dirname, '..', '..', '..', 'commands', 'sign-windows.js');
 const eventsPath = path.join(__dirname, '..', '..', '..', 'lib', 'sign-helpers', 'sign-events.js');
 const signWindows = require(signerPath);
-const Manager = new (require(path.join(__dirname, '..', '..', '..', 'build.js')))();
+const build = require(path.join(__dirname, '..', '..', '..', 'build.js'));
 
 const NOT_WINDOWS  = 'Windows-only: signtool + the EV token live on the signing box';
 const NO_SIGNTOOL  = 'signtool is not reachable — install the Windows SDK / VS Build Tools, or set SIGNTOOL_PATH';
@@ -76,7 +76,7 @@ function currentGate() {
   // The strategy comes from the project's own config — the same call the signer
   // makes — and is only worth resolving where the rest of the gate has passed.
   if (process.platform !== 'win32') return gateReason(process.platform, process.env, false, null);
-  return gateReason(process.platform, process.env, signtoolOnPath(process.env), Manager.getWindowsSignStrategy());
+  return gateReason(process.platform, process.env, signtoolOnPath(process.env), build.getWindowsSignStrategy());
 }
 
 // The signer, loaded with its event log pointed inside this suite's scratch

package/dist/test/suites/build/templating.test.js

@@ -52,11 +52,11 @@ module.exports = defineCases({
       },
     },
     {
-      name: 'buildPageVars produces brand/app/page/theme/cacheBust from a manager-like object',
+      name: 'buildPageVars produces brand/app/page/theme/cacheBust from an omega-like object',
       run: (ctx) => {
         const t = require(path.join(__dirname, '..', '..', '..', 'lib', 'templating.js'));
-        const fakeManager = { config: { brand: { name: 'MyApp', id: 'myapp' }, app: { productName: 'MyApp' } } };
-        const vars = t.buildPageVars('settings', { cacheBust: '12345' }, fakeManager);
+        const fakeOmega = { config: { brand: { name: 'MyApp', id: 'myapp' }, app: { productName: 'MyApp' } } };
+        const vars = t.buildPageVars('settings', { cacheBust: '12345' }, fakeOmega);
         ctx.expect(vars.page.name).toBe('settings');
         ctx.expect(vars.page.title).toBe('MyApp');
         ctx.expect(vars.brand.id).toBe('myapp');

package/dist/test/suites/build/test-stealth.test.js

@@ -68,19 +68,17 @@ module.exports = defineCases({
       },
     },
     {
-      name: 'a provided manager answers from the config IT was baked with',
+      name: 'a provided instance answers from the config IT was baked with',
       run: (ctx) => {
-        // The build-time Manager carries the same mixin as the runtime Managers,
-        // and since #817 they all read the ONE input: the process variable, or
-        // the baked `config.environment` when the process has none.
-        const Manager = require('../../../build.js');
+        // An instance carrying the shared isTesting() answers like the runtime
+        // `omega` instances: since #817 they all read the ONE input, the process
+        // variable, or the baked `config.environment` when the process has none.
+        const { isTesting } = require('../../../utils/mode-helpers.js');
         withEnv({ OMEGA_ENVIRONMENT: undefined, OMEGA_TEST_SHOW: undefined }, () => {
-          const testing = new Manager();
-          testing.config = { environment: 'testing' };
+          const testing = { isTesting, config: { environment: 'testing' } };
           ctx.expect(isTestStealth(testing)).toBe(true);
 
-          const production = new Manager();
-          production.config = { environment: 'production' };
+          const production = { isTesting, config: { environment: 'production' } };
           ctx.expect(isTestStealth(production)).toBe(false);
         });
       },