@mentra/miniapp 3.4.0-dev.1017 → 3.4.0-dev.1020

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.
@@ -31,6 +31,8 @@ export declare class DispatchTransport implements Transport {
31
31
  private messageHandler;
32
32
  private disconnectHandler;
33
33
  private open_;
34
+ /** The delivery hook this transport installed; another transport may own the global later. */
35
+ private deliverHook;
34
36
  /** True iff `__dispatch` is bound on the current globalThis. */
35
37
  static isAvailable(): boolean;
36
38
  open(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../src/transport/dispatch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAC,SAAS,EAAE,0BAA0B,EAAE,uBAAuB,EAAC,MAAM,SAAS,CAAA;AAYtF,qBAAa,iBAAkB,YAAW,SAAS;IACjD,OAAO,CAAC,cAAc,CAAuC;IAC7D,OAAO,CAAC,iBAAiB,CAA0C;IACnE,OAAO,CAAC,KAAK,CAAQ;IAErB,gEAAgE;IAChE,MAAM,CAAC,WAAW,IAAI,OAAO;IAIvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAqBvB,SAAS,CAAC,OAAO,EAAE,uBAAuB,GAAG,IAAI;IAIjD,YAAY,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAIvD,KAAK,IAAI,IAAI;IAQb,MAAM,IAAI,OAAO;CAGlB"}
1
+ {"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../src/transport/dispatch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAC,SAAS,EAAE,0BAA0B,EAAE,uBAAuB,EAAC,MAAM,SAAS,CAAA;AAYtF,qBAAa,iBAAkB,YAAW,SAAS;IACjD,OAAO,CAAC,cAAc,CAAuC;IAC7D,OAAO,CAAC,iBAAiB,CAA0C;IACnE,OAAO,CAAC,KAAK,CAAQ;IACrB,8FAA8F;IAC9F,OAAO,CAAC,WAAW,CAAuC;IAE1D,gEAAgE;IAChE,MAAM,CAAC,WAAW,IAAI,OAAO;IAIvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAe3B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAqBvB,SAAS,CAAC,OAAO,EAAE,uBAAuB,GAAG,IAAI;IAIjD,YAAY,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAIvD,KAAK,IAAI,IAAI;IAUb,MAAM,IAAI,OAAO;CAGlB"}
@@ -31,6 +31,8 @@ export class DispatchTransport {
31
31
  this.messageHandler = null;
32
32
  this.disconnectHandler = null;
33
33
  this.open_ = false;
34
+ /** The delivery hook this transport installed; another transport may own the global later. */
35
+ this.deliverHook = null;
34
36
  }
35
37
  /** True iff `__dispatch` is bound on the current globalThis. */
36
38
  static isAvailable() {
@@ -44,10 +46,11 @@ export class DispatchTransport {
44
46
  // route bridge frames here. Installed lazily so multiple transports
45
47
  // can share the same global if a test spins up two.
46
48
  const g = globalThis;
47
- g.__mentraDeliverBridgeRaw = (raw) => {
49
+ this.deliverHook = (raw) => {
48
50
  if (this.messageHandler)
49
51
  this.messageHandler(raw);
50
52
  };
53
+ g.__mentraDeliverBridgeRaw = this.deliverHook;
51
54
  this.open_ = true;
52
55
  }
53
56
  send(raw) {
@@ -80,9 +83,11 @@ export class DispatchTransport {
80
83
  close() {
81
84
  this.open_ = false;
82
85
  const g = globalThis;
83
- if (g.__mentraDeliverBridgeRaw) {
86
+ // A replacement session's transport may have installed its own hook since.
87
+ if (this.deliverHook && g.__mentraDeliverBridgeRaw === this.deliverHook) {
84
88
  delete g.__mentraDeliverBridgeRaw;
85
89
  }
90
+ this.deliverHook = null;
86
91
  }
87
92
  isOpen() {
88
93
  return this.open_;
@@ -1 +1 @@
1
- {"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../src/transport/dispatch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAcH,MAAM,OAAO,iBAAiB;IAA9B;QACU,mBAAc,GAAmC,IAAI,CAAA;QACrD,sBAAiB,GAAsC,IAAI,CAAA;QAC3D,UAAK,GAAG,KAAK,CAAA;IA6DvB,CAAC;IA3DC,gEAAgE;IAChE,MAAM,CAAC,WAAW;QAChB,OAAO,OAAQ,UAA6C,CAAC,UAAU,KAAK,UAAU,CAAA;IACxF,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAA;QACjF,CAAC;QACD,oEAAoE;QACpE,oEAAoE;QACpE,oDAAoD;QACpD,MAAM,CAAC,GAAG,UAA4C,CAAA;QACtD,CAAC,CAAC,wBAAwB,GAAG,CAAC,GAAW,EAAE,EAAE;YAC3C,IAAI,IAAI,CAAC,cAAc;gBAAE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;QACnD,CAAC,CAAA;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;IACnB,CAAC;IAED,IAAI,CAAC,GAAW;QACd,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;QAC5D,CAAC;QACD,MAAM,CAAC,GAAG,UAA4C,CAAA;QACtD,IAAI,OAAO,CAAC,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;YACvC,kEAAkE;YAClE,mDAAmD;YACnD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;YAClB,IAAI,CAAC,iBAAiB,EAAE,CAAC,2CAA2C,CAAC,CAAA;YACrE,OAAM;QACR,CAAC;QACD,kEAAkE;QAClE,sDAAsD;QACtD,IAAI,CAAC;YACH,CAAC,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QACzD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,iBAAiB,EAAE,CAAC,wCAAwC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QAC/E,CAAC;IACH,CAAC;IAED,SAAS,CAAC,OAAgC;QACxC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAA;IAC/B,CAAC;IAED,YAAY,CAAC,OAAmC;QAC9C,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAA;IAClC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,MAAM,CAAC,GAAG,UAA4C,CAAA;QACtD,IAAI,CAAC,CAAC,wBAAwB,EAAE,CAAC;YAC/B,OAAO,CAAC,CAAC,wBAAwB,CAAA;QACnC,CAAC;IACH,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;CACF"}
1
+ {"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../src/transport/dispatch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAcH,MAAM,OAAO,iBAAiB;IAA9B;QACU,mBAAc,GAAmC,IAAI,CAAA;QACrD,sBAAiB,GAAsC,IAAI,CAAA;QAC3D,UAAK,GAAG,KAAK,CAAA;QACrB,8FAA8F;QACtF,gBAAW,GAAmC,IAAI,CAAA;IAgE5D,CAAC;IA9DC,gEAAgE;IAChE,MAAM,CAAC,WAAW;QAChB,OAAO,OAAQ,UAA6C,CAAC,UAAU,KAAK,UAAU,CAAA;IACxF,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAA;QACjF,CAAC;QACD,oEAAoE;QACpE,oEAAoE;QACpE,oDAAoD;QACpD,MAAM,CAAC,GAAG,UAA4C,CAAA;QACtD,IAAI,CAAC,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE;YACjC,IAAI,IAAI,CAAC,cAAc;gBAAE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;QACnD,CAAC,CAAA;QACD,CAAC,CAAC,wBAAwB,GAAG,IAAI,CAAC,WAAW,CAAA;QAC7C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;IACnB,CAAC;IAED,IAAI,CAAC,GAAW;QACd,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;QAC5D,CAAC;QACD,MAAM,CAAC,GAAG,UAA4C,CAAA;QACtD,IAAI,OAAO,CAAC,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;YACvC,kEAAkE;YAClE,mDAAmD;YACnD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;YAClB,IAAI,CAAC,iBAAiB,EAAE,CAAC,2CAA2C,CAAC,CAAA;YACrE,OAAM;QACR,CAAC;QACD,kEAAkE;QAClE,sDAAsD;QACtD,IAAI,CAAC;YACH,CAAC,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QACzD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,iBAAiB,EAAE,CAAC,wCAAwC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QAC/E,CAAC;IACH,CAAC;IAED,SAAS,CAAC,OAAgC;QACxC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAA;IAC/B,CAAC;IAED,YAAY,CAAC,OAAmC;QAC9C,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAA;IAClC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,MAAM,CAAC,GAAG,UAA4C,CAAA;QACtD,2EAA2E;QAC3E,IAAI,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,wBAAwB,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;YACxE,OAAO,CAAC,CAAC,wBAAwB,CAAA;QACnC,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;IACzB,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;CACF"}
@@ -15,6 +15,11 @@ export interface LocalSocketTransportOptions {
15
15
  export declare class LocalSocketTransport implements Transport {
16
16
  private url;
17
17
  private ws;
18
+ /**
19
+ * The socket an open() in progress is connecting. A later open() or close()
20
+ * abandons it, so a socket that connects late cannot replace the active one.
21
+ */
22
+ private connecting;
18
23
  private messageHandler;
19
24
  private disconnectHandler;
20
25
  constructor(options?: LocalSocketTransportOptions);
@@ -24,5 +29,6 @@ export declare class LocalSocketTransport implements Transport {
24
29
  onDisconnect(handler: TransportDisconnectHandler): void;
25
30
  close(): void;
26
31
  isOpen(): boolean;
32
+ private abandonConnecting;
27
33
  }
28
34
  //# sourceMappingURL=local-socket.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"local-socket.d.ts","sourceRoot":"","sources":["../../src/transport/local-socket.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAC,SAAS,EAAE,0BAA0B,EAAE,uBAAuB,EAAC,MAAM,SAAS,CAAA;AAEtF,MAAM,WAAW,2BAA2B;IAC1C,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAID,qBAAa,oBAAqB,YAAW,SAAS;IACpD,OAAO,CAAC,GAAG,CAAQ;IACnB,OAAO,CAAC,EAAE,CAAyB;IACnC,OAAO,CAAC,cAAc,CAAuC;IAC7D,OAAO,CAAC,iBAAiB,CAA0C;gBAEvD,OAAO,GAAE,2BAAgC;IAI/C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC3B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAOvB,SAAS,CAAC,OAAO,EAAE,uBAAuB,GAAG,IAAI;IAIjD,YAAY,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAIvD,KAAK,IAAI,IAAI;IAUb,MAAM,IAAI,OAAO;CAGlB"}
1
+ {"version":3,"file":"local-socket.d.ts","sourceRoot":"","sources":["../../src/transport/local-socket.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAC,SAAS,EAAE,0BAA0B,EAAE,uBAAuB,EAAC,MAAM,SAAS,CAAA;AAEtF,MAAM,WAAW,2BAA2B;IAC1C,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAID,qBAAa,oBAAqB,YAAW,SAAS;IACpD,OAAO,CAAC,GAAG,CAAQ;IACnB,OAAO,CAAC,EAAE,CAAyB;IACnC;;;OAGG;IACH,OAAO,CAAC,UAAU,CAAyB;IAC3C,OAAO,CAAC,cAAc,CAAuC;IAC7D,OAAO,CAAC,iBAAiB,CAA0C;gBAEvD,OAAO,GAAE,2BAAgC;IAI/C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA+C3B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAOvB,SAAS,CAAC,OAAO,EAAE,uBAAuB,GAAG,IAAI;IAIjD,YAAY,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAIvD,KAAK,IAAI,IAAI;IAWb,MAAM,IAAI,OAAO;IAIjB,OAAO,CAAC,iBAAiB;CAU1B"}
@@ -12,6 +12,11 @@ const DEFAULT_URL = "ws://127.0.0.1:8765";
12
12
  export class LocalSocketTransport {
13
13
  constructor(options = {}) {
14
14
  this.ws = null;
15
+ /**
16
+ * The socket an open() in progress is connecting. A later open() or close()
17
+ * abandons it, so a socket that connects late cannot replace the active one.
18
+ */
19
+ this.connecting = null;
15
20
  this.messageHandler = null;
16
21
  this.disconnectHandler = null;
17
22
  this.url = options.url ?? DEFAULT_URL;
@@ -22,8 +27,10 @@ export class LocalSocketTransport {
22
27
  if (typeof WebSocket === "undefined") {
23
28
  throw new Error("LocalSocketTransport: browser WebSocket global not available");
24
29
  }
30
+ this.abandonConnecting();
25
31
  await new Promise((resolve, reject) => {
26
32
  const ws = new WebSocket(this.url);
33
+ this.connecting = ws;
27
34
  let settled = false;
28
35
  const settle = (fn) => {
29
36
  if (settled)
@@ -32,6 +39,11 @@ export class LocalSocketTransport {
32
39
  fn();
33
40
  };
34
41
  ws.onopen = () => {
42
+ if (this.connecting !== ws) {
43
+ settle(() => reject(new Error("LocalSocketTransport: open was superseded")));
44
+ return;
45
+ }
46
+ this.connecting = null;
35
47
  this.ws = ws;
36
48
  settle(() => resolve());
37
49
  };
@@ -39,13 +51,20 @@ export class LocalSocketTransport {
39
51
  settle(() => reject(new Error(`LocalSocketTransport: failed to connect to ${this.url}: ${String(ev)}`)));
40
52
  };
41
53
  ws.onmessage = (ev) => {
54
+ if (this.ws !== ws)
55
+ return;
42
56
  const data = ev.data;
43
57
  if (typeof data === "string")
44
58
  this.messageHandler?.(data);
45
59
  };
46
60
  ws.onclose = (ev) => {
47
- if (this.ws === ws)
48
- this.ws = null;
61
+ if (this.connecting === ws)
62
+ this.connecting = null;
63
+ settle(() => reject(new Error(`LocalSocketTransport: closed before opening: ${ev.code} ${ev.reason}`)));
64
+ // Only the active socket's close is a disconnect; an abandoned one was never in use.
65
+ if (this.ws !== ws)
66
+ return;
67
+ this.ws = null;
49
68
  this.disconnectHandler?.(`closed: ${ev.code} ${ev.reason}`);
50
69
  };
51
70
  });
@@ -63,6 +82,7 @@ export class LocalSocketTransport {
63
82
  this.disconnectHandler = handler;
64
83
  }
65
84
  close() {
85
+ this.abandonConnecting();
66
86
  if (!this.ws)
67
87
  return;
68
88
  try {
@@ -76,5 +96,17 @@ export class LocalSocketTransport {
76
96
  isOpen() {
77
97
  return !!this.ws && this.ws.readyState === WebSocket.OPEN;
78
98
  }
99
+ abandonConnecting() {
100
+ const ws = this.connecting;
101
+ this.connecting = null;
102
+ if (!ws)
103
+ return;
104
+ try {
105
+ ws.close();
106
+ }
107
+ catch {
108
+ // ignore
109
+ }
110
+ }
79
111
  }
80
112
  //# sourceMappingURL=local-socket.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"local-socket.js","sourceRoot":"","sources":["../../src/transport/local-socket.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"local-socket.js","sourceRoot":"","sources":["../../src/transport/local-socket.ts"],"names":[],"mappings":"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"}
@@ -10,7 +10,10 @@
10
10
  export type TransportMessageHandler = (raw: string) => void;
11
11
  export type TransportDisconnectHandler = (reason: string) => void;
12
12
  export interface Transport {
13
- /** Establish whatever connection the transport needs. May be a no-op. */
13
+ /**
14
+ * Establish whatever connection the transport needs. May be a no-op. Resolves
15
+ * at once when already open: a retried handshake calls it again.
16
+ */
14
17
  open(): Promise<void>;
15
18
  /** Send a serialized envelope. */
16
19
  send(raw: string): void;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/transport/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,MAAM,uBAAuB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;AAC3D,MAAM,MAAM,0BAA0B,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;AAEjE,MAAM,WAAW,SAAS;IACxB,yEAAyE;IACzE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrB,kCAAkC;IAClC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,6DAA6D;IAC7D,SAAS,CAAC,OAAO,EAAE,uBAAuB,GAAG,IAAI,CAAA;IACjD,oEAAoE;IACpE,YAAY,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI,CAAA;IACvD,+CAA+C;IAC/C,KAAK,IAAI,IAAI,CAAA;IACb,MAAM,IAAI,OAAO,CAAA;CAClB"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/transport/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,MAAM,uBAAuB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;AAC3D,MAAM,MAAM,0BAA0B,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;AAEjE,MAAM,WAAW,SAAS;IACxB;;;OAGG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrB,kCAAkC;IAClC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,6DAA6D;IAC7D,SAAS,CAAC,OAAO,EAAE,uBAAuB,GAAG,IAAI,CAAA;IACjD,oEAAoE;IACpE,YAAY,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI,CAAA;IACvD,+CAA+C;IAC/C,KAAK,IAAI,IAAI,CAAA;IACb,MAAM,IAAI,OAAO,CAAA;CAClB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mentra/miniapp",
3
- "version": "3.4.0-dev.1017",
3
+ "version": "3.4.0-dev.1020",
4
4
  "description": "SDK for building MentraOS local miniapps (browser/WebView)",
5
5
  "author": "Mentra Labs",
6
6
  "license": "Apache-2.0",
@@ -57,7 +57,7 @@
57
57
  }
58
58
  },
59
59
  "dependencies": {
60
- "@mentra/cloud-protocol": "3.4.0-dev.1017",
60
+ "@mentra/cloud-protocol": "3.4.0-dev.1020",
61
61
  "eventemitter3": "^5.0.1"
62
62
  },
63
63
  "devDependencies": {
@@ -13,7 +13,9 @@
13
13
  * 2. Call the user-supplied handler synchronously so subscriptions
14
14
  * are registered before any host events fan out.
15
15
  * 3. Call `session.connect()` so the host receives CONNECT and the
16
- * first CONNECT_ACK populates `userId`, `capabilities`, etc.
16
+ * first CONNECT_ACK populates `userId`, `capabilities`, etc. A host that
17
+ * has not answered within `connectTimeoutMs` gets CONNECT again; that is
18
+ * a stalled host, not a miniapp crash.
17
19
  * 4. Send READY once the handler's returned promise settles. Hosts that
18
20
  * advertise `hostFeatures.initReady` keep the UI closed until then.
19
21
  *
@@ -22,7 +24,7 @@
22
24
  * re-evaluated and the handler fires again with a fresh session.
23
25
  */
24
26
 
25
- import {MiniappSession, type MiniappSessionOptions} from "../session"
27
+ import {MiniappSession, NotConnectedError, type MiniappSessionOptions} from "../session"
26
28
 
27
29
  export type TypedMiniappSession<TChannels extends object> = MiniappSession<TChannels>
28
30
 
@@ -38,6 +40,18 @@ interface InitGlobals {
38
40
  * Optional because tests / pure-Node environments don't have it.
39
41
  */
40
42
  __hostError?: (payloadJson: string) => void
43
+ /**
44
+ * The session from the latest init. Global rather than module state so a
45
+ * bundle evaluated again in the same context also finds it.
46
+ */
47
+ __mentraBackgroundSession?: MiniappSession
48
+ }
49
+
50
+ /** A later init replaces the session: disconnecting it ends its handshake, so it neither retries nor reports. */
51
+ function releaseBackgroundSession(g: InitGlobals): void {
52
+ const previous = g.__mentraBackgroundSession
53
+ g.__mentraBackgroundSession = undefined
54
+ previous?.disconnect()
41
55
  }
42
56
 
43
57
  /**
@@ -62,8 +76,13 @@ export function registerMiniapp<TChannels extends object = Record<string, unknow
62
76
  options: MiniappSessionOptions = {},
63
77
  ): void {
64
78
  const g = globalThis as unknown as InitGlobals
79
+ releaseBackgroundSession(g)
65
80
  g.__mentraInitCallback = (sessionId: string) => {
81
+ releaseBackgroundSession(g)
66
82
  const session = new MiniappSession<TChannels>(options)
83
+ g.__mentraBackgroundSession = session
84
+ // Before the handler runs, so its own connect() or waitForReady() shares the retried handshake.
85
+ session.retryHandshakeOnTimeout()
67
86
  // The handler's returned promise defines readiness: the host keeps the UI
68
87
  // closed until it settles, so handlers registered after an await still
69
88
  // exist before the first UI request arrives.
@@ -95,6 +114,9 @@ export function registerMiniapp<TChannels extends object = Record<string, unknow
95
114
  },
96
115
  )
97
116
  connected.catch((err: unknown) => {
117
+ // Replaced by a later init, or disconnected during the handshake: a
118
+ // deliberate teardown, not a crash.
119
+ if (g.__mentraBackgroundSession !== session || err instanceof NotConnectedError) return
98
120
  // eslint-disable-next-line no-console
99
121
  console.error("[mentra-miniapp] session.connect() rejected:", err)
100
122
  // Surface to the host's crash controller as a structured uncaught
package/src/session.ts CHANGED
@@ -171,6 +171,17 @@ export class NotConnectedError extends Error {
171
171
  }
172
172
  }
173
173
 
174
+ /**
175
+ * @internal — `connect()` rejects with this when the host did not answer CONNECT
176
+ * within `connectTimeoutMs`. The session stays usable: `connect()` sends CONNECT again.
177
+ */
178
+ export class ConnectAckTimeoutError extends Error {
179
+ constructor() {
180
+ super("MiniappSession: CONNECT_ACK timeout")
181
+ this.name = "ConnectAckTimeoutError"
182
+ }
183
+ }
184
+
174
185
  export interface MiniappRequestError {
175
186
  code: string
176
187
  message: string
@@ -189,6 +200,8 @@ interface PendingRequest {
189
200
  }
190
201
 
191
202
  const DEFAULT_CONNECT_TIMEOUT_MS = 10_000
203
+ /** Pause before a `registerMiniapp` session sends CONNECT again after a CONNECT_ACK timeout. */
204
+ const CONNECT_RETRY_MS = 1_000
192
205
 
193
206
  // Hard ceiling on how long a single bridge request waits for the host's
194
207
  // REQUEST_RESULT. Without it, a host that never responds (a hung cloud call, a
@@ -315,11 +328,19 @@ export class MiniappSession<TChannels extends object = any> {
315
328
 
316
329
  /**
317
330
  * Outbound queue for anything sent before CONNECT_ACK. Flushed in FIFO order
318
- * once the phone responds with CONNECT_ACK.
331
+ * once the phone responds with CONNECT_ACK. A queued request carries its id so
332
+ * one that has already been rejected is dropped instead of sent.
319
333
  */
320
- private readonly outboundQueue: string[] = []
334
+ private readonly outboundQueue: Array<{raw: string; requestId?: string}> = []
321
335
  private readonly pendingRequests = new Map<string, PendingRequest>()
336
+ /** In flight or succeeded. A failed attempt clears it so `connect()` can send CONNECT again. */
322
337
  private connectPromise: Promise<void> | null = null
338
+ /** Rejects the handshake in flight. Set only while waiting for CONNECT_ACK. */
339
+ private failHandshake: ((error: Error) => void) | null = null
340
+ /** Set by `registerMiniapp`: a CONNECT_ACK timeout sends CONNECT again instead of failing `connect()`. */
341
+ private retryHandshake = false
342
+ /** Ends the pause before CONNECT is sent again, with the failure that ended it if any. Set only during that pause. */
343
+ private endRetryPause: ((failure?: Error) => void) | null = null
323
344
  private disposed = false
324
345
  /**
325
346
  * Set by `registerMiniapp` to the host's id for this spawn: CONNECT tells the
@@ -458,52 +479,158 @@ export class MiniappSession<TChannels extends object = any> {
458
479
  // -------------------------------------------------------------------------
459
480
 
460
481
  /**
461
- * Connect to LocalMiniappRuntime. Idempotent — calling multiple times
462
- * returns the same Promise.
482
+ * Connect to LocalMiniappRuntime. Idempotent while a handshake is in flight
483
+ * or has succeeded: repeat calls return the same Promise. A failed attempt
484
+ * (CONNECT_ACK timeout, transport failure) does not stick, so a later call
485
+ * sends CONNECT again. A session started by `registerMiniapp` keeps sending
486
+ * CONNECT after a timeout, so this Promise (and `waitForReady()`) settles
487
+ * only when the host answers, the transport fails, or the session ends.
463
488
  */
464
489
  connect(): Promise<void> {
465
490
  if (this.disposed) {
466
491
  return Promise.reject(new NotConnectedError("MiniappSession was disposed"))
467
492
  }
468
493
  if (this.connectPromise) return this.connectPromise
494
+ // A CONNECT_ACK that arrived after an earlier attempt timed out still completed the handshake.
495
+ if (this.ready) {
496
+ this.connectPromise = Promise.resolve()
497
+ return this.connectPromise
498
+ }
499
+
500
+ const attempt = this.retryHandshake ? this.connectUntilAcknowledged() : this.sendConnect()
501
+ this.connectPromise = attempt
502
+ attempt.catch(() => {
503
+ // Registered before the caller's handlers, so a retry from a rejection handler sends CONNECT again.
504
+ if (this.connectPromise === attempt) this.connectPromise = null
505
+ })
506
+ return attempt
507
+ }
508
+
509
+ /**
510
+ * @internal — called by `registerMiniapp` before its handler runs. The host
511
+ * owns this context's lifetime, so a host that has not answered CONNECT is
512
+ * stalled rather than gone: send CONNECT again instead of failing.
513
+ */
514
+ retryHandshakeOnTimeout(): void {
515
+ this.retryHandshake = true
516
+ }
469
517
 
518
+ private async connectUntilAcknowledged(): Promise<void> {
519
+ for (;;) {
520
+ try {
521
+ await this.sendConnect()
522
+ return
523
+ } catch (err) {
524
+ if (this.disposed || !(err instanceof ConnectAckTimeoutError)) throw err
525
+ }
526
+ // eslint-disable-next-line no-console
527
+ console.warn("[mentra-miniapp] CONNECT_ACK timed out; sending CONNECT again")
528
+ const failure = await this.pauseBeforeRetry()
529
+ if (failure) throw failure
530
+ // The CONNECT_ACK for an earlier CONNECT can still land during the pause.
531
+ if (this.ready) return
532
+ if (this.disposed) throw new NotConnectedError("MiniappSession: connect aborted")
533
+ }
534
+ }
535
+
536
+ /**
537
+ * Resolves after CONNECT_RETRY_MS, or as soon as CONNECT_ACK lands or the
538
+ * session ends. Resolves with the error when the transport failed meanwhile.
539
+ */
540
+ private pauseBeforeRetry(): Promise<Error | undefined> {
541
+ return new Promise<Error | undefined>((resolve) => {
542
+ const end = (failure?: Error) => {
543
+ clearTimeout(timer)
544
+ this.emitter.off("ready", onReady)
545
+ if (this.endRetryPause === end) this.endRetryPause = null
546
+ resolve(failure)
547
+ }
548
+ const onReady = () => end()
549
+ const timer = setTimeout(end, CONNECT_RETRY_MS)
550
+ this.emitter.on("ready", onReady)
551
+ this.endRetryPause = end
552
+ })
553
+ }
554
+
555
+ /** Send one CONNECT and wait for its CONNECT_ACK. */
556
+ private sendConnect(): Promise<void> {
557
+ // Only a host that received CONNECT can be waited out. Before that, the transport is what failed.
558
+ let connectSent = false
559
+ // This attempt's own outcome. A slow open() can finish after a newer attempt
560
+ // took over, so nothing below acts through the session-wide failHandshake.
561
+ let attemptSettled = false
562
+ let failAttempt: (error: Error) => void = () => {}
470
563
  // Register the readiness listener BEFORE any awaits so that a synchronous
471
564
  // CONNECT_ACK delivery in tests (or the phone) can't race the subscription.
472
565
  const readyPromise = new Promise<void>((resolve, reject) => {
566
+ const settle = (error?: Error) => {
567
+ if (attemptSettled) return
568
+ attemptSettled = true
569
+ clearTimeout(timer)
570
+ this.emitter.off("ready", onReady)
571
+ this.emitter.off("error", onError)
572
+ if (this.failHandshake === onError) this.failHandshake = null
573
+ if (error) reject(error)
574
+ else resolve()
575
+ }
576
+ const onReady = () => settle()
577
+ const onError = (error: Error) => settle(error)
473
578
  const timer = setTimeout(() => {
474
- const err = new Error("MiniappSession: CONNECT_ACK timeout")
579
+ const err = connectSent
580
+ ? new ConnectAckTimeoutError()
581
+ : new Error("MiniappSession: transport did not open before the CONNECT_ACK timeout")
582
+ // Settled before the public emit, so a throwing "error" listener cannot leave it pending.
583
+ settle(err)
584
+ // Requests queued for a retried handshake wait for it, bounded by their own timeouts.
585
+ if (connectSent && this.retryHandshake) return
475
586
  this.failAllPending({code: MiniappErrorCode.NOT_CONNECTED, message: err.message})
476
587
  this.emitter.emit("error", err)
477
- reject(err)
478
588
  }, this.connectTimeoutMs)
479
-
480
- this.emitter.once("ready", () => {
481
- clearTimeout(timer)
482
- resolve()
483
- })
484
- this.emitter.once("error", (err) => {
485
- clearTimeout(timer)
486
- reject(err)
487
- })
589
+ this.emitter.on("ready", onReady)
590
+ this.emitter.on("error", onError)
591
+ this.failHandshake = onError
592
+ failAttempt = onError
488
593
  })
489
-
490
- this.connectPromise = (async () => {
491
- this.transport.onMessage((raw) => this.handleIncoming(raw))
492
- this.transport.onDisconnect((reason) => this.handleTransportDisconnect(reason))
493
- await this.transport.open()
494
-
495
- const requestId = makeRequestId()
496
- const connectPayload = {
497
- type: MiniappRequestType.CONNECT,
498
- packageName: this.packageName,
499
- ...(this.initSessionId !== null ? {initReady: true, sessionId: this.initSessionId} : {}),
594
+ // Settles once CONNECT is sent, or rejects if opening or sending fails.
595
+ const sent = (async () => {
596
+ try {
597
+ this.transport.onMessage((raw) => this.handleIncoming(raw))
598
+ this.transport.onDisconnect((reason) => this.handleTransportDisconnect(reason))
599
+ // An open transport stays as it is: a retried handshake only sends CONNECT again.
600
+ const opening = this.transport.isOpen() ? Promise.resolve() : this.transport.open()
601
+ // An open that finishes after disconnect() must not leave the transport open.
602
+ opening.then(
603
+ () => {
604
+ if (this.disposed) this.transport.close()
605
+ },
606
+ () => {},
607
+ )
608
+ await opening
609
+ // Settled while opening: failed (the timeout, disconnect(), a transport drop),
610
+ // or completed by an earlier CONNECT's ACK. Either way, send nothing.
611
+ if (attemptSettled) return
612
+ if (this.disposed) throw new NotConnectedError("MiniappSession: connect aborted")
613
+
614
+ const requestId = makeRequestId()
615
+ const connectPayload = {
616
+ type: MiniappRequestType.CONNECT,
617
+ packageName: this.packageName,
618
+ ...(this.initSessionId !== null ? {initReady: true, sessionId: this.initSessionId} : {}),
619
+ }
620
+ connectSent = true
621
+ this.transport.send(serializeEnvelope({payload: connectPayload, requestId}))
622
+ } catch (err) {
623
+ // Already reported through readyPromise; a newer attempt may own the session now.
624
+ if (attemptSettled) return
625
+ const error = err instanceof Error ? err : new Error(String(err))
626
+ if (!this.disposed) this.failAllPending({code: MiniappErrorCode.NOT_CONNECTED, message: error.message})
627
+ failAttempt(error)
628
+ throw error
500
629
  }
501
- this.transport.send(serializeEnvelope({payload: connectPayload, requestId}))
502
-
503
- await readyPromise
504
630
  })()
505
-
506
- return this.connectPromise
631
+ // The handshake can fail while the transport is still opening (disconnect(),
632
+ // the timeout): the attempt settles then, without waiting for open().
633
+ return Promise.all([sent, readyPromise]).then(() => undefined)
507
634
  }
508
635
 
509
636
  /**
@@ -534,6 +661,10 @@ export class MiniappSession<TChannels extends object = any> {
534
661
  disconnect(): void {
535
662
  if (this.disposed) return
536
663
  this.disposed = true
664
+ // End a handshake still waiting for CONNECT_ACK. Its timer would otherwise
665
+ // report a timeout for a session that no longer exists.
666
+ this.failHandshake?.(new NotConnectedError("MiniappSession: connect aborted"))
667
+ this.endRetryPause?.()
537
668
  // Give listeners one synchronous chance to flush final messages
538
669
  // (e.g. display.render([])) before we tear down the transport.
539
670
  try {
@@ -602,7 +733,7 @@ export class MiniappSession<TChannels extends object = any> {
602
733
  reject,
603
734
  timer,
604
735
  })
605
- this.enqueueOrSend(serializeEnvelope(envelope))
736
+ this.enqueueOrSend(serializeEnvelope(envelope), requestId)
606
737
  })
607
738
  }
608
739
 
@@ -647,7 +778,7 @@ export class MiniappSession<TChannels extends object = any> {
647
778
  // Internal — transport glue
648
779
  // -------------------------------------------------------------------------
649
780
 
650
- private enqueueOrSend(raw: string): void {
781
+ private enqueueOrSend(raw: string, requestId?: string): void {
651
782
  if (this.ready) {
652
783
  try {
653
784
  this.transport.send(raw)
@@ -657,12 +788,15 @@ export class MiniappSession<TChannels extends object = any> {
657
788
  }
658
789
  return
659
790
  }
660
- this.outboundQueue.push(raw)
791
+ this.outboundQueue.push(requestId === undefined ? {raw} : {raw, requestId})
661
792
  }
662
793
 
663
794
  private flushQueue(): void {
664
795
  const queue = this.outboundQueue.splice(0)
665
- for (const raw of queue) {
796
+ for (const {raw, requestId} of queue) {
797
+ // Rejected while waiting for the handshake (a CONNECT_ACK timeout or its own
798
+ // timeout). Its caller has seen the failure, so the host must not run it.
799
+ if (requestId !== undefined && !this.pendingRequests.has(requestId)) continue
666
800
  try {
667
801
  this.transport.send(raw)
668
802
  } catch (err) {
@@ -912,6 +1046,11 @@ export class MiniappSession<TChannels extends object = any> {
912
1046
 
913
1047
  private handleTransportDisconnect(reason: string): void {
914
1048
  this.ready = false
1049
+ // A transport that drops during the handshake has failed it. Sending CONNECT
1050
+ // again over a dead bridge would keep that failure from the host.
1051
+ const failure = new Error(`MiniappSession: transport disconnected: ${reason}`)
1052
+ this.failHandshake?.(failure)
1053
+ this.endRetryPause?.(failure)
915
1054
  this.failAllPending({code: MiniappErrorCode.NOT_CONNECTED, message: `Transport disconnected: ${reason}`})
916
1055
  this.emitter.emit("disconnect", reason)
917
1056
  }
@@ -84,6 +84,11 @@ class LocalSocketWithMockFallback implements Transport {
84
84
  constructor(private readonly options: LocalSocketTransportOptions) {}
85
85
 
86
86
  async open(): Promise<void> {
87
+ // A retried handshake opens again: keep the transport already selected.
88
+ if (this.active?.isOpen()) return
89
+ // One that dropped is replaced, so it cannot keep delivering to the handlers.
90
+ this.active?.close()
91
+ this.active = null
87
92
  const local = new LocalSocketTransport(this.options)
88
93
  let timedOut = false
89
94
  const timeout = new Promise<void>((_, reject) => {
@@ -43,6 +43,8 @@ export class DispatchTransport implements Transport {
43
43
  private messageHandler: TransportMessageHandler | null = null
44
44
  private disconnectHandler: TransportDisconnectHandler | null = null
45
45
  private open_ = false
46
+ /** The delivery hook this transport installed; another transport may own the global later. */
47
+ private deliverHook: ((raw: string) => void) | null = null
46
48
 
47
49
  /** True iff `__dispatch` is bound on the current globalThis. */
48
50
  static isAvailable(): boolean {
@@ -57,9 +59,10 @@ export class DispatchTransport implements Transport {
57
59
  // route bridge frames here. Installed lazily so multiple transports
58
60
  // can share the same global if a test spins up two.
59
61
  const g = globalThis as unknown as BridgeDeliverGlobal
60
- g.__mentraDeliverBridgeRaw = (raw: string) => {
62
+ this.deliverHook = (raw: string) => {
61
63
  if (this.messageHandler) this.messageHandler(raw)
62
64
  }
65
+ g.__mentraDeliverBridgeRaw = this.deliverHook
63
66
  this.open_ = true
64
67
  }
65
68
 
@@ -95,9 +98,11 @@ export class DispatchTransport implements Transport {
95
98
  close(): void {
96
99
  this.open_ = false
97
100
  const g = globalThis as unknown as BridgeDeliverGlobal
98
- if (g.__mentraDeliverBridgeRaw) {
101
+ // A replacement session's transport may have installed its own hook since.
102
+ if (this.deliverHook && g.__mentraDeliverBridgeRaw === this.deliverHook) {
99
103
  delete g.__mentraDeliverBridgeRaw
100
104
  }
105
+ this.deliverHook = null
101
106
  }
102
107
 
103
108
  isOpen(): boolean {