@staff0rd/assist 0.1093.1 → 0.1094.0

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.
package/dist/index.js CHANGED
@@ -6,7 +6,7 @@ import { Command } from "commander";
6
6
  // package.json
7
7
  var package_default = {
8
8
  name: "@staff0rd/assist",
9
- version: "0.1093.1",
9
+ version: "0.1094.0",
10
10
  type: "module",
11
11
  main: "dist/index.js",
12
12
  bin: {
@@ -51556,20 +51556,6 @@ function toSessionInfo(session) {
51556
51556
  };
51557
51557
  }
51558
51558
 
51559
- // src/commands/sessions/daemon/userActivity.ts
51560
- var LOG_AFTER_IDLE_MS = 6e4;
51561
- var lastAt;
51562
- var userActivity = {
51563
- get: () => lastAt,
51564
- record: (at2 = Date.now()) => {
51565
- if (lastAt === void 0 || at2 - lastAt > LOG_AFTER_IDLE_MS)
51566
- daemonLog(
51567
- `user-activity: web UI in use${lastAt === void 0 ? "" : ` after ${Math.round((at2 - lastAt) / 1e3)}s idle`}`
51568
- );
51569
- lastAt = at2;
51570
- }
51571
- };
51572
-
51573
51559
  // src/commands/sessions/daemon/broadcastSessions.ts
51574
51560
  var activityCounts = /* @__PURE__ */ new WeakMap();
51575
51561
  function broadcastSessions(sessions, clients, linkedSessions = [], active) {
@@ -51578,12 +51564,11 @@ function broadcastSessions(sessions, clients, linkedSessions = [], active) {
51578
51564
  const count10 = (activityCounts.get(sessions) ?? 0) + (local.some(isBusy) ? 1 : 0);
51579
51565
  activityCounts.set(sessions, count10);
51580
51566
  const restartActivity = `${process.pid}:${count10}`;
51581
- const lastUserActivityAt = userActivity.get();
51582
51567
  const viewers = clients.viewers();
51583
51568
  broadcast(viewers, {
51584
51569
  type: "sessions",
51585
51570
  restartActivity,
51586
- lastUserActivityAt,
51571
+ lastUserActivityAt: clients.userActivity.get(),
51587
51572
  sessions: local.concat(linkedSessions),
51588
51573
  active: active?.toJSON() ?? {}
51589
51574
  });
@@ -52159,6 +52144,21 @@ function activeWindows(rateLimits, harness) {
52159
52144
  return out;
52160
52145
  }
52161
52146
 
52147
+ // src/commands/sessions/daemon/UserActivity.ts
52148
+ var LOG_AFTER_IDLE_MS = 6e4;
52149
+ var UserActivity = class {
52150
+ lastAt;
52151
+ get = () => this.lastAt;
52152
+ record(source, at2 = Date.now()) {
52153
+ const last = this.lastAt;
52154
+ if (last === void 0 || at2 - last > LOG_AFTER_IDLE_MS)
52155
+ daemonLog(
52156
+ `user-activity: ${source} in use${last === void 0 ? "" : ` after ${Math.round((at2 - last) / 1e3)}s idle`}`
52157
+ );
52158
+ this.lastAt = at2;
52159
+ }
52160
+ };
52161
+
52162
52162
  // src/shared/db/recordUsagePeak.ts
52163
52163
  async function recordUsagePeak(db, rateLimits, now = Math.floor(Date.now() / 1e3), harness) {
52164
52164
  for (const window of RATE_LIMIT_WINDOWS) {
@@ -52201,6 +52201,7 @@ var ClientHub = class extends Set {
52201
52201
  logSubscribers = /* @__PURE__ */ new Set();
52202
52202
  peers = /* @__PURE__ */ new Map();
52203
52203
  webServers = /* @__PURE__ */ new Set();
52204
+ userActivity = new UserActivity();
52204
52205
  updateLimits(rateLimits) {
52205
52206
  this.latestLimits = rateLimits;
52206
52207
  broadcast(this, { type: "limits", rateLimits });
@@ -58023,6 +58024,7 @@ function requestLinkHistory(ctx) {
58023
58024
  }
58024
58025
 
58025
58026
  // src/commands/sessions/daemon/links/NodeLink.ts
58027
+ var ACTIVITY_LOG_GAP_MS = 6e4;
58026
58028
  var NodeLink = class {
58027
58029
  constructor(spec, deps2) {
58028
58030
  this.spec = spec;
@@ -58032,6 +58034,7 @@ var NodeLink = class {
58032
58034
  }
58033
58035
  spec;
58034
58036
  ctx;
58037
+ lastActivityRelayAt = Number.NEGATIVE_INFINITY;
58035
58038
  start = () => this.ctx.connect();
58036
58039
  unlatch() {
58037
58040
  if (!this.ctx.blockedMessage) return;
@@ -58046,6 +58049,14 @@ var NodeLink = class {
58046
58049
  route(client, data) {
58047
58050
  forwardToLink(this.ctx, client, data);
58048
58051
  }
58052
+ relayUserActivity(now = Date.now()) {
58053
+ const delivered = this.ctx.greeted && sendToLink(this.ctx, { type: "user-activity" });
58054
+ if (now - this.lastActivityRelayAt > ACTIVITY_LOG_GAP_MS)
58055
+ daemonLog(
58056
+ `link ${this.spec.name} ws: ${delivered ? "relayed" : `DROPPED (${unavailableReason(this.ctx)})`} user-activity`
58057
+ );
58058
+ this.lastActivityRelayAt = now;
58059
+ }
58049
58060
  viewerLeft(viewerId) {
58050
58061
  if (!this.ctx.greeted) return;
58051
58062
  if (sendToLink(this.ctx, { type: "viewer-left", viewerId }))
@@ -58148,6 +58159,11 @@ var NodeLinks = class {
58148
58159
  if (this.clients.isPeer(client)) return false;
58149
58160
  return routeToLink(this.links, this.localNode(), client, data);
58150
58161
  }
58162
+ relayUserActivity(nodes) {
58163
+ if (!Array.isArray(nodes)) return;
58164
+ for (const node of new Set(nodes))
58165
+ if (typeof node === "string") this.links.get(node)?.relayUserActivity();
58166
+ }
58151
58167
  viewerLeft(client, viewerId) {
58152
58168
  if (this.clients.isPeer(client)) return;
58153
58169
  for (const link3 of this.all()) link3.viewerLeft(viewerId);
@@ -59287,6 +59303,13 @@ var inboxHandlers = {
59287
59303
  }
59288
59304
  };
59289
59305
 
59306
+ // src/commands/sessions/daemon/handleUserActivity.ts
59307
+ var handleUserActivity = (client, m, d) => {
59308
+ const fromPeer = m.clients.isPeer(client);
59309
+ m.clients.userActivity.record(fromPeer ? "linked node's web UI" : "web UI");
59310
+ if (!fromPeer) m.links.relayUserActivity(d.nodes);
59311
+ };
59312
+
59290
59313
  // src/commands/sessions/shared/parseTranscript.ts
59291
59314
  import * as fs58 from "fs";
59292
59315
  async function parseTranscript(sessionId2) {
@@ -59908,7 +59931,7 @@ var messageHandlers = {
59908
59931
  },
59909
59932
  "pr-preview": (client, m, d) => m.prPreview.set(client, d),
59910
59933
  "pr-decision": routed((_client, m, d) => m.prPreview.decide(d)),
59911
- "user-activity": () => userActivity.record(),
59934
+ "user-activity": handleUserActivity,
59912
59935
  "ui-status": (_client, _m, d) => daemonLog(`ui rendered: id=${d.sessionId} status=${d.status}`)
59913
59936
  };
59914
59937
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@staff0rd/assist",
3
- "version": "0.1093.1",
3
+ "version": "0.1094.0",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "bin": {