@volter/teams 0.2.47 → 0.2.48

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/machine-door.mjs +16 -1
  2. package/package.json +1 -1
package/machine-door.mjs CHANGED
@@ -13,8 +13,11 @@ export async function openMachine({ machine = null, context = null, env = proces
13
13
  // This machine named by its own name is its own daemon, reached over its socket: through the Teams server it waited
14
14
  // on the org's machine list and a server channel, and a launch on this box failed whenever the server was rate
15
15
  // limited or out of reach (two review resumes, 17:03Z and 17:34Z, retired as never issued).
16
- if (!machine.startsWith('mach_') && normalMachineName(machine) === normalMachineName(hostname()) && existsSync(paths(home).socket)) return openLocalMachine(paths(home).socket);
16
+ // Its own name is the one this home is enrolled under, never the host's: a second machine enrolled from the same host
17
+ // shares the host name with the first, and one reaching the other by that name must go through the Teams server (its
18
+ // own socket is its own daemon, which would hand the request back to itself until the caller gave up).
17
19
  const supercodeHome = env.SUPERCODE_HOME ?? resolve(home, '..');
20
+ if (!machine.startsWith('mach_') && normalMachineName(machine) === ownMachineName(supercodeHome) && existsSync(paths(home).socket)) return openLocalMachine(paths(home).socket);
18
21
  const contexts = new WorkspaceContexts(supercodeHome);
19
22
  const name = context ?? env.SUPERCODE_CONTEXT ?? contexts.read().current;
20
23
  if (!name || name === 'local') throw Object.assign(new Error('a remote machine is reached through a Teams context: `supercode teams login …`, then `supercode context use NAME` or --context NAME'), { code: 'invalid_request' });
@@ -50,6 +53,18 @@ export async function openMachine({ machine = null, context = null, env = proces
50
53
  return channel;
51
54
  }
52
55
 
56
+ /** The name this home's machine goes by, in the form mail addresses use: its enrollment's in the home's current
57
+ * context, else (an unenrolled machine) the host's. */
58
+ export function ownMachineName(supercodeHome) {
59
+ let name = hostname();
60
+ try {
61
+ const contexts = new WorkspaceContexts(supercodeHome);
62
+ const doc = contexts.read(), context = doc.contexts[doc.current];
63
+ name = contexts.connector(context.server_id, context.team_id).read()?.machine?.name || name;
64
+ } catch { /* an unenrolled machine goes by its host name */ }
65
+ return normalMachineName(name);
66
+ }
67
+
53
68
  /** A machine name in the form mail addresses use: the short host name, lowercased, with anything outside [a-z0-9_-] as `-`. */
54
69
  export function normalMachineName(name) {
55
70
  return String(name).split('.')[0].toLowerCase().replace(/[^a-z0-9_-]/g, '-');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@volter/teams",
3
- "version": "0.2.47",
3
+ "version": "0.2.48",
4
4
  "type": "module",
5
5
  "description": "Volter Teams, the neutral team plane: machine identity and daemon core, the local door and server link, admission from machine grants, product doors, and the Teams server's neutral routes (company RFC 0008).",
6
6
  "license": "MIT",