akanjs 3.0.0-beta.24 → 3.0.0-beta.26

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 (45) hide show
  1. package/common/hmrPhase.ts +2 -0
  2. package/package.json +1 -1
  3. package/server/SSR_MEMORY_DIAGNOSIS.md +2 -2
  4. package/server/akanApp.ts +1 -0
  5. package/server/akanServer.ts +7 -1
  6. package/server/artifact/builderRpc.ts +13 -2
  7. package/server/artifact/devBuildRecovery.ts +12 -0
  8. package/server/artifact/index.ts +1 -0
  9. package/server/artifact/ipcTypes.ts +46 -3
  10. package/server/artifact/routeClientCache.ts +128 -29
  11. package/server/di/diLifecycle.ts +1 -1
  12. package/server/hmr/clientScript.ts +148 -86
  13. package/server/hmr/csrDevManifest.ts +17 -0
  14. package/server/hmr/csrDevRuntime.ts +238 -18
  15. package/server/hmr/csrDevShell.ts +90 -10
  16. package/server/hmr/devArtifactPruner.ts +77 -0
  17. package/server/hmr/devHmrController.ts +233 -137
  18. package/server/hmr/ssrDevShim.ts +112 -0
  19. package/server/hmr/ssrUpdateQueue.ts +111 -0
  20. package/server/hmr/wsHub.ts +19 -4
  21. package/server/routing/apiRouter.ts +12 -0
  22. package/server/rscWorker.tsx +11 -1
  23. package/server/rscWorkerHost.ts +223 -59
  24. package/server/systemPageDocument.tsx +6 -0
  25. package/server/types.tsx +4 -0
  26. package/server/webRouter.ts +57 -22
  27. package/types/common/hmrPhase.d.ts +2 -0
  28. package/types/server/artifact/builderRpc.d.ts +3 -2
  29. package/types/server/artifact/devBuildRecovery.d.ts +4 -0
  30. package/types/server/artifact/index.d.ts +1 -0
  31. package/types/server/artifact/ipcTypes.d.ts +47 -2
  32. package/types/server/artifact/routeClientCache.d.ts +9 -2
  33. package/types/server/hmr/csrDevManifest.d.ts +15 -0
  34. package/types/server/hmr/csrDevRuntime.d.ts +34 -0
  35. package/types/server/hmr/csrDevShell.d.ts +9 -1
  36. package/types/server/hmr/devArtifactPruner.d.ts +9 -0
  37. package/types/server/hmr/devHmrController.d.ts +8 -5
  38. package/types/server/hmr/ssrDevShim.d.ts +7 -0
  39. package/types/server/hmr/ssrUpdateQueue.d.ts +23 -0
  40. package/types/server/hmr/wsHub.d.ts +16 -7
  41. package/types/server/routing/apiRouter.d.ts +8 -0
  42. package/types/server/rscWorkerHost.d.ts +14 -2
  43. package/types/server/systemPageDocument.d.ts +2 -0
  44. package/types/server/types.d.ts +4 -0
  45. package/types/server/webRouter.d.ts +8 -2
@@ -0,0 +1,111 @@
1
+ import type { SsrUpdatedPayload } from "../artifact";
2
+ import type { HmrMessage } from "./wsHub";
3
+
4
+ export type SsrUpdateMessage = Extract<HmrMessage, { type: "ssr-update" }>;
5
+
6
+ interface HeldUpdate {
7
+ message: SsrUpdateMessage;
8
+ hold: boolean;
9
+ batchGeneration?: number;
10
+ heldAt: number;
11
+ }
12
+
13
+ export class SsrUpdateQueue {
14
+ readonly #send: (message: SsrUpdateMessage) => void;
15
+ readonly #maxHoldMs: number;
16
+ readonly #held: HeldUpdate[] = [];
17
+ #timer: ReturnType<typeof setTimeout> | null = null;
18
+
19
+ constructor(send: (message: SsrUpdateMessage) => void, { maxHoldMs = 15_000 }: { maxHoldMs?: number } = {}) {
20
+ this.#send = send;
21
+ this.#maxHoldMs = maxHoldMs;
22
+ }
23
+
24
+ get size(): number {
25
+ return this.#held.length;
26
+ }
27
+
28
+ push(update: SsrUpdatedPayload): void {
29
+ const message: SsrUpdateMessage = {
30
+ type: "ssr-update",
31
+ generation: update.generation,
32
+ url: update.patchUrl,
33
+ changedIds: update.changedIds,
34
+ reload: update.reload,
35
+ reason: update.reason,
36
+ trace: update.trace,
37
+ };
38
+ const entry: HeldUpdate = {
39
+ message,
40
+ hold: !!update.hold,
41
+ batchGeneration: update.batchGeneration,
42
+ heldAt: Date.now(),
43
+ };
44
+
45
+ if (update.reload) {
46
+ for (const held of this.#held.splice(0)) {
47
+ if (!held.hold) continue;
48
+ entry.hold = true;
49
+ entry.heldAt = Math.min(entry.heldAt, held.heldAt);
50
+ if (held.batchGeneration !== undefined)
51
+ entry.batchGeneration = Math.max(entry.batchGeneration ?? held.batchGeneration, held.batchGeneration);
52
+ }
53
+ }
54
+ if (!entry.hold && this.#held.length === 0) {
55
+ this.#stopTimer();
56
+ this.#send(message);
57
+ return;
58
+ }
59
+ this.#held.push(entry);
60
+ this.#arm();
61
+ }
62
+
63
+ /**
64
+ * The pages batch of `generation` finished or failed: sends what it covers and everything queued behind that, and
65
+ * says whether a reload went out (the tabs then need no RSC refresh).
66
+ */
67
+ release(generation: number | undefined): { released: number; reload: boolean } {
68
+ return this.#shift((held) => !this.#waitsPast(held, generation), true);
69
+ }
70
+
71
+ /** Drops what the pages batch of `generation` covers, or everything without one: the tabs are about to reload. */
72
+ clear(generation?: number): void {
73
+ if (generation === undefined) this.#held.length = 0;
74
+ else this.#shift((held) => !this.#waitsPast(held, generation), false);
75
+ this.#arm();
76
+ }
77
+
78
+ #waitsPast(held: HeldUpdate, generation: number | undefined): boolean {
79
+ return held.hold && held.batchGeneration !== undefined && (generation ?? -1) < held.batchGeneration;
80
+ }
81
+
82
+ #shift(due: (held: HeldUpdate) => boolean, send: boolean): { released: number; reload: boolean } {
83
+ let released = 0;
84
+ let reload = false;
85
+ for (let next = this.#held[0]; next && due(next); next = this.#held[0]) {
86
+ this.#held.shift();
87
+ if (send) this.#send(next.message);
88
+ released += 1;
89
+ reload ||= !!next.message.reload;
90
+ }
91
+ this.#arm();
92
+ return { released, reload };
93
+ }
94
+
95
+ #arm(): void {
96
+ this.#stopTimer();
97
+ const head = this.#held[0];
98
+ if (!head) return;
99
+ const delay = Math.max(0, head.heldAt + this.#maxHoldMs - Date.now());
100
+ this.#timer = setTimeout(() => {
101
+ this.#timer = null;
102
+ const now = Date.now();
103
+ this.#shift((held) => !held.hold || now - held.heldAt >= this.#maxHoldMs, true);
104
+ }, delay);
105
+ }
106
+
107
+ #stopTimer(): void {
108
+ if (this.#timer) clearTimeout(this.#timer);
109
+ this.#timer = null;
110
+ }
111
+ }
@@ -1,11 +1,12 @@
1
1
  import { Logger } from "akanjs/common";
2
- import type { BuildPhase } from "../artifact";
2
+ import type { BuildPhase, HmrTrace } from "../artifact";
3
3
 
4
4
  export type ChangeKind = "code" | "css" | "config" | "ignore";
5
5
 
6
6
  export interface ChangeBatch {
7
7
  files: string[];
8
8
  kinds: Set<Exclude<ChangeKind, "ignore">>;
9
+ trace?: HmrTrace;
9
10
  }
10
11
 
11
12
  export type HmrClientKind = "ssr" | "csr";
@@ -22,6 +23,10 @@ export type HmrMessage =
22
23
  buildId: number;
23
24
  cssAssets?: Record<string, { cssUrl: string; cssRelPath: string }>;
24
25
  csrGeneration?: number;
26
+ ssrGeneration?: number;
27
+ ssrEpoch?: number;
28
+ /** The phases failing now, each sent right after: a tab drops an error it holds for any other. */
29
+ failingPhases?: string[];
25
30
  }
26
31
  | { type: "reload"; buildId: number }
27
32
  | {
@@ -31,14 +36,24 @@ export type HmrMessage =
31
36
  changedIds?: string[];
32
37
  reload?: boolean;
33
38
  reason?: string;
39
+ trace?: HmrTrace;
34
40
  }
35
- | { type: "rsc-refresh"; buildId: number; generation?: number; changedFiles?: string[]; routeIds?: string[] }
36
41
  | {
37
- type: "client-refresh";
42
+ type: "ssr-update";
43
+ generation: number;
44
+ url?: string;
45
+ changedIds?: string[];
46
+ reload?: boolean;
47
+ reason?: string;
48
+ trace?: HmrTrace;
49
+ }
50
+ | {
51
+ type: "rsc-refresh";
38
52
  buildId: number;
39
53
  generation?: number;
40
54
  changedFiles?: string[];
41
55
  routeIds?: string[];
56
+ trace?: HmrTrace;
42
57
  }
43
58
  | { type: "css-update"; cssAssets?: Record<string, { cssUrl: string; cssRelPath: string }> }
44
59
  | { type: "sync-navigation"; clientId: string; href: string; kind?: "push" | "replace" | "back" | "pop" }
@@ -85,7 +100,7 @@ export class HmrWsHub {
85
100
 
86
101
  static #audienceOf(msg: HmrMessage): HmrClientKind | "all" {
87
102
  if (msg.type === "csr-update") return "csr";
88
- if (msg.type === "reload" || msg.type === "rsc-refresh" || msg.type === "client-refresh") return "ssr";
103
+ if (msg.type === "reload" || msg.type === "rsc-refresh" || msg.type === "ssr-update") return "ssr";
89
104
  return "all";
90
105
  }
91
106
 
@@ -14,7 +14,13 @@ export interface HmrStateSource {
14
14
  buildId: number;
15
15
  cssAssets?: Record<string, { cssUrl: string; cssRelPath: string }>;
16
16
  csrGeneration?: number;
17
+ ssrGeneration?: number;
18
+ ssrEpoch?: number;
17
19
  };
20
+ /** Called before each hello: brings what the state says about the dev registries up to what is on disk. */
21
+ refresh?: () => void;
22
+ /** Sent right after hello: the build statuses failing now, which the socket connected too late to hear. */
23
+ errors?: () => { phase: string }[];
18
24
  }
19
25
 
20
26
  export type NonNullHttpRoutes = NonNullable<HttpRoutes>;
@@ -100,14 +106,20 @@ export class ApiRouter {
100
106
  const data = ws.data as WsTaggedData | undefined;
101
107
  if (data?.kind === "akan-hmr" && hmrHub && hmrState) {
102
108
  hmrHub.attach(ws as unknown as Bun.ServerWebSocket<HmrWsData>);
109
+ hmrState.refresh?.();
110
+ const errors = hmrState.errors?.() ?? [];
103
111
  ws.send(
104
112
  JSON.stringify({
105
113
  type: "hello",
106
114
  buildId: hmrState.state.buildId,
107
115
  cssAssets: hmrState.state.cssAssets,
108
116
  csrGeneration: hmrState.state.csrGeneration,
117
+ ssrGeneration: hmrState.state.ssrGeneration,
118
+ ssrEpoch: hmrState.state.ssrEpoch,
119
+ ...(hmrState.errors ? { failingPhases: errors.map((status) => status.phase) } : {}),
109
120
  }),
110
121
  );
122
+ for (const status of errors) ws.send(JSON.stringify(status));
111
123
  return;
112
124
  }
113
125
  SignalResolver.handleWsOpen(ws, registry);
@@ -101,6 +101,7 @@ interface ReloadMsg {
101
101
  cssAssets?: Record<string, { cssUrl: string; cssRelPath: string }>;
102
102
  buildId: number;
103
103
  pagesBundlePath?: string;
104
+ reloadId?: number;
104
105
  }
105
106
  interface UpdateCssAssetsMsg {
106
107
  type: "updateCssAssets";
@@ -386,15 +387,24 @@ export class RscRenderer {
386
387
  this.#resultCache.clear();
387
388
  this.#patchResultCache.clear();
388
389
  this.#logger.verbose(`reload complete buildId=${msg.buildId} in ${Date.now() - startedAt}ms`);
389
- this.#send({ type: "reloaded", buildId: msg.buildId });
390
+ this.#send({
391
+ type: "reloaded",
392
+ buildId: msg.buildId,
393
+ reloadId: msg.reloadId,
394
+ pagesBundlePath: nextPagesBundlePath,
395
+ });
390
396
  } catch (error) {
391
397
  this.#logger.error(
392
398
  `reload failed buildId=${msg.buildId}: ${error instanceof Error ? (error.stack ?? error.message) : String(error)}`,
393
399
  );
400
+
401
+ if (seq !== this.#reloadSeq) return;
394
402
  this.#send({
395
403
  type: "error",
396
404
  requestId: "__reload__",
397
405
  buildId: msg.buildId,
406
+ reloadId: msg.reloadId,
407
+ running: { pagesBundlePath: this.#pagesBundlePath, buildId: this.#pagesBundleBuildId },
398
408
  message: error instanceof Error ? error.message : String(error),
399
409
  });
400
410
  }