wherever-dev 0.12.0 → 0.13.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.
Files changed (33) hide show
  1. package/dist/drafts.d.ts +7 -0
  2. package/dist/drafts.d.ts.map +1 -1
  3. package/dist/drafts.js +10 -3
  4. package/dist/drafts.js.map +1 -1
  5. package/dist/index.js +199 -15
  6. package/dist/index.js.map +1 -1
  7. package/dist/session-pool.d.ts +23 -0
  8. package/dist/session-pool.d.ts.map +1 -1
  9. package/dist/session-pool.js +33 -1
  10. package/dist/session-pool.js.map +1 -1
  11. package/package.json +1 -1
  12. package/public/_app/immutable/chunks/{55QXfSWV.js → CyQq9q8L.js} +2 -2
  13. package/public/_app/immutable/chunks/{55QXfSWV.js.map → CyQq9q8L.js.map} +1 -1
  14. package/public/_app/immutable/chunks/DdFruy3e.js +2 -0
  15. package/public/_app/immutable/chunks/{CuGyzHtA.js.map → DdFruy3e.js.map} +1 -1
  16. package/public/_app/immutable/chunks/{sERBGsNa.js → vSWNc7VF.js} +2 -2
  17. package/public/_app/immutable/chunks/{sERBGsNa.js.map → vSWNc7VF.js.map} +1 -1
  18. package/public/_app/immutable/entry/{app.DN0r_HfQ.js → app.BzMua2z6.js} +3 -3
  19. package/public/_app/immutable/entry/{app.DN0r_HfQ.js.map → app.BzMua2z6.js.map} +1 -1
  20. package/public/_app/immutable/entry/start.B0ap2dTz.js +2 -0
  21. package/public/_app/immutable/entry/start.B0ap2dTz.js.map +1 -0
  22. package/public/_app/immutable/nodes/{0.BhHgt5Z6.js → 0.BDXduH3G.js} +2 -2
  23. package/public/_app/immutable/nodes/{0.BhHgt5Z6.js.map → 0.BDXduH3G.js.map} +1 -1
  24. package/public/_app/immutable/nodes/{1.B9mDAaoD.js → 1.CqJo-807.js} +2 -2
  25. package/public/_app/immutable/nodes/{1.B9mDAaoD.js.map → 1.CqJo-807.js.map} +1 -1
  26. package/public/_app/immutable/nodes/{2.BjlQDhkN.js → 2.C6-6KHYk.js} +2 -2
  27. package/public/_app/immutable/nodes/{2.BjlQDhkN.js.map → 2.C6-6KHYk.js.map} +1 -1
  28. package/public/_app/version.json +1 -1
  29. package/public/index.html +10 -10
  30. package/public/service-worker.js +1 -1
  31. package/public/_app/immutable/chunks/CuGyzHtA.js +0 -2
  32. package/public/_app/immutable/entry/start.CSyfkZFS.js +0 -2
  33. package/public/_app/immutable/entry/start.CSyfkZFS.js.map +0 -1
package/dist/drafts.d.ts CHANGED
@@ -38,6 +38,13 @@ export interface Draft {
38
38
  export declare class DraftsUnavailableError extends Error {
39
39
  constructor(reason: string);
40
40
  }
41
+ /**
42
+ * Drafts live in the STATE dir, not the config dir. They are the canonical
43
+ * example of the split: the config directory can be read-only (rendered by the
44
+ * deployment), while this file is written on every save. `WHEREVER_STATE_DIR`
45
+ * defaults to the config dir, so an install that sets neither variable (or only
46
+ * `WHEREVER_CONFIG_DIR`) keeps the exact path it has today.
47
+ */
41
48
  export declare function getDraftsPath(): string;
42
49
  /** Newest-updated first, ties broken by id so the order is deterministic. */
43
50
  export declare function sortDrafts(drafts: Draft[]): Draft[];
@@ -1 +1 @@
1
- {"version":3,"file":"drafts.d.ts","sourceRoot":"","sources":["../src/drafts.ts"],"names":[],"mappings":"AAwBA;;;;GAIG;AACH,eAAO,MAAM,UAAU,MAAM,CAAC;AAE9B,8EAA8E;AAC9E,eAAO,MAAM,eAAe,QAAQ,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,OAAO,CAAC;AAKzC,MAAM,WAAW,KAAK;IACpB,6CAA6C;IAC7C,EAAE,EAAE,MAAM,CAAC;IACX,8CAA8C;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,4BAA4B;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,uEAAuE;IACvE,SAAS,EAAE,MAAM,CAAC;IAClB,gEAAgE;IAChE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAOD;;;;;;;GAOG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;gBACnC,MAAM,EAAE,MAAM;CAI3B;AAED,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED,6EAA6E;AAC7E,wBAAgB,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAEnD;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,KAAK,EAAE,GAAG,IAAI,CAmC1E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAGvD;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;GASG;AACH;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE;IACxC,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,GAAG,MAAM,GAAG,IAAI,CAkBhB;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,cAAc,GAAG,KAAK,EAAE,CAkBzE;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,GAAG,KAAK,EAAE,CAEhE;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,IAAI,KAAK,EAAE,CAmBpC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAejD;AAED,wBAAgB,UAAU,IAAI,MAAM,CAMnC;AAED,sDAAsD;AACtD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,GAAG,KAAK,CAAC,CAAC,GAAG,KAAK,EAAE,CAUzH;AAED,sDAAsD;AACtD,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,KAAK,EAAE,CAI/C"}
1
+ {"version":3,"file":"drafts.d.ts","sourceRoot":"","sources":["../src/drafts.ts"],"names":[],"mappings":"AAwBA;;;;GAIG;AACH,eAAO,MAAM,UAAU,MAAM,CAAC;AAE9B,8EAA8E;AAC9E,eAAO,MAAM,eAAe,QAAQ,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,OAAO,CAAC;AAKzC,MAAM,WAAW,KAAK;IACpB,6CAA6C;IAC7C,EAAE,EAAE,MAAM,CAAC;IACX,8CAA8C;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,4BAA4B;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,uEAAuE;IACvE,SAAS,EAAE,MAAM,CAAC;IAClB,gEAAgE;IAChE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAOD;;;;;;;GAOG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;gBACnC,MAAM,EAAE,MAAM;CAI3B;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED,6EAA6E;AAC7E,wBAAgB,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAEnD;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,KAAK,EAAE,GAAG,IAAI,CAmC1E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAGvD;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;GASG;AACH;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE;IACxC,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf,GAAG,MAAM,GAAG,IAAI,CAkBhB;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,cAAc,GAAG,KAAK,EAAE,CAkBzE;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,GAAG,KAAK,EAAE,CAEhE;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,IAAI,KAAK,EAAE,CAmBpC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAejD;AAED,wBAAgB,UAAU,IAAI,MAAM,CAMnC;AAED,sDAAsD;AACtD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,GAAG,KAAK,CAAC,CAAC,GAAG,KAAK,EAAE,CAUzH;AAED,sDAAsD;AACtD,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,KAAK,EAAE,CAI/C"}
package/dist/drafts.js CHANGED
@@ -1,6 +1,6 @@
1
1
  // Saved drafts: messages the user chose to KEEP instead of sending.
2
2
  //
3
- // The store lives on the SERVER (`<config dir>/drafts.json`), not in a browser,
3
+ // The store lives on the SERVER (`<state dir>/drafts.json`), not in a browser,
4
4
  // because that is the whole point of wherever: the machine holds the state and
5
5
  // any device picks it up. A draft written on a phone has to be there on the
6
6
  // laptop, and clearing site data must not destroy it. (The composer's per-session
@@ -19,7 +19,7 @@
19
19
  // client adopts verbatim.
20
20
  import fs from 'node:fs';
21
21
  import path from 'node:path';
22
- import { getWhereverConfigDir } from './session-pool.js';
22
+ import { getWhereverStateDir } from './session-pool.js';
23
23
  /**
24
24
  * Hard cap on retained drafts, dropping the least recently touched. A draft is
25
25
  * kept forever by definition, so without a cap this file is the one thing here
@@ -51,8 +51,15 @@ export class DraftsUnavailableError extends Error {
51
51
  this.name = 'DraftsUnavailableError';
52
52
  }
53
53
  }
54
+ /**
55
+ * Drafts live in the STATE dir, not the config dir. They are the canonical
56
+ * example of the split: the config directory can be read-only (rendered by the
57
+ * deployment), while this file is written on every save. `WHEREVER_STATE_DIR`
58
+ * defaults to the config dir, so an install that sets neither variable (or only
59
+ * `WHEREVER_CONFIG_DIR`) keeps the exact path it has today.
60
+ */
54
61
  export function getDraftsPath() {
55
- return path.join(getWhereverConfigDir(), 'drafts.json');
62
+ return path.join(getWhereverStateDir(), 'drafts.json');
56
63
  }
57
64
  /** Newest-updated first, ties broken by id so the order is deterministic. */
58
65
  export function sortDrafts(drafts) {
@@ -1 +1 @@
1
- {"version":3,"file":"drafts.js","sourceRoot":"","sources":["../src/drafts.ts"],"names":[],"mappings":"AAAA,oEAAoE;AACpE,EAAE;AACF,gFAAgF;AAChF,+EAA+E;AAC/E,4EAA4E;AAC5E,kFAAkF;AAClF,gFAAgF;AAChF,2EAA2E;AAC3E,oEAAoE;AACpE,EAAE;AACF,gFAAgF;AAChF,8EAA8E;AAC9E,kFAAkF;AAClF,oEAAoE;AACpE,EAAE;AACF,8EAA8E;AAC9E,gFAAgF;AAChF,iFAAiF;AACjF,0BAA0B;AAE1B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD;;;;GAIG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAC;AAE9B,8EAA8E;AAC9E,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC;AAErC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC;AAEzC,+EAA+E;AAC/E,MAAM,qBAAqB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAsB9C;;;;;;;GAOG;AACH,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IAC/C,YAAY,MAAc;QACxB,KAAK,CAAC,GAAG,aAAa,EAAE,uBAAuB,MAAM,2BAA2B,CAAC,CAAC;QAClF,IAAI,CAAC,IAAI,GAAG,wBAAwB,CAAC;IACvC,CAAC;CACF;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,aAAa,CAAC,CAAC;AAC1D,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,UAAU,CAAC,MAAe;IACxC,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC3F,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,WAAW,CAAC,GAA8B;IACxD,IAAI,GAAG,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAC7B,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACvC,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAC/B,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAE,MAAqB,CAAC,MAAM,CAAC;YACpF,CAAC,CAAE,MAAqB,CAAC,MAAM;YAC/B,CAAC,CAAC,IAAI,CAAC;IACX,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,MAAM,GAAG,GAAY,EAAE,CAAC;IACxB,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,SAAS;QAChD,MAAM,CAAC,GAAG,IAA+B,CAAC;QAC1C,IAAI,OAAO,CAAC,CAAC,EAAE,KAAK,QAAQ,IAAI,CAAC,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAC5D,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ;YAAE,SAAS;QACzC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAChC,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5E,GAAG,CAAC,IAAI,CAAC;YACP,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,IAAI;YACJ,SAAS;YACT,SAAS;YACT,GAAG,CAAC,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtE,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACrD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAe;IAC7C,MAAM,IAAI,GAAe,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;IAChD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACvC,CAAC;AAUD;;;;;;;;;GASG;AACH;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAIlC;IACC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrE,OAAO,yBAAyB,CAAC;IACnC,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,eAAe,EAAE,CAAC;QAC/C,OAAO,yBAAyB,eAAe,aAAa,CAAC;IAC/D,CAAC;IACD,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI;QAC3B,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC;QAC9B,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC;KACV,EAAE,CAAC;QACX,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;YAAE,SAAS;QACpD,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,GAAG,KAAK,mBAAmB,CAAC;QAClE,IAAI,KAAK,CAAC,MAAM,GAAG,oBAAoB,EAAE,CAAC;YACxC,OAAO,GAAG,KAAK,kBAAkB,oBAAoB,aAAa,CAAC;QACrE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,MAAe,EAAE,KAAqB;IAC9D,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAC/B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,eAAe;QAAE,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;IAClF,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACrD,MAAM,IAAI,GAAY,QAAQ;QAC5B,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,CAAC,CAAC;YACE;gBACE,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,IAAI;gBACJ,SAAS,EAAE,KAAK,CAAC,GAAG;gBACpB,SAAS,EAAE,KAAK,CAAC,GAAG;gBACpB,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1D,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACzC;YACD,GAAG,MAAM;SACV,CAAC;IACN,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAe,EAAE,EAAU;IACrD,OAAO,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AACvD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,UAAU;IACxB,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,IAAI,CAAC,IAAI,GAAG,qBAAqB,EAAE,CAAC;YACtC,MAAM,IAAI,sBAAsB,CAAC,GAAG,IAAI,CAAC,IAAI,2BAA2B,CAAC,CAAC;QAC5E,CAAC;QACD,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,sBAAsB;YAAE,MAAM,GAAG,CAAC;QACrD,MAAM,IAAI,sBAAsB,CAAE,GAAa,EAAE,OAAO,IAAI,aAAa,CAAC,CAAC;IAC7E,CAAC;IACD,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IAChC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,MAAM,IAAI,sBAAsB,CAAC,yBAAyB,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,WAAW,CAAC,MAAe;IACzC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC;IAC9D,IAAI,CAAC;QACH,sEAAsE;QACtE,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAClF,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC;YACH,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QACV,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,IAAI,CAAC;QACH,OAAO,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;IACpE,CAAC;AACH,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,QAAQ,CAAC,KAAuF;IAC9G,MAAM,IAAI,GAAG,SAAS,CAAC,UAAU,EAAE,EAAE;QACnC,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,UAAU,EAAE;QAC5B,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE;QAC5B,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,GAAG,EAAE,KAAK,CAAC,GAAG;KACf,CAAC,CAAC;IACH,WAAW,CAAC,IAAI,CAAC,CAAC;IAClB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,WAAW,CAAC,EAAU;IACpC,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;IAC3C,WAAW,CAAC,IAAI,CAAC,CAAC;IAClB,OAAO,IAAI,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"drafts.js","sourceRoot":"","sources":["../src/drafts.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -2,7 +2,7 @@
2
2
  import { createServer as createHttpServer } from 'node:http';
3
3
  import { createServer as createHttpsServer, request as httpRequest } from 'node:https';
4
4
  import { WebSocketServer, WebSocket } from 'ws';
5
- import { SessionPool, getWhereverConfig, detectRemoteRepo } from './session-pool.js';
5
+ import { SessionPool, getWhereverConfig, getWhereverCertsDir, detectRemoteRepo } from './session-pool.js';
6
6
  import { readDrafts, addDraft, deleteDraft, validateDraftInput } from './drafts.js';
7
7
  import { searchConversations } from './conversation-search.js';
8
8
  import { INITIAL_HISTORY_LIMIT, HISTORY_PAGE_SIZE } from './protocol.js';
@@ -312,19 +312,123 @@ function evictPreviousConnection(clientKey, clients, pool, onSessionsUpdated) {
312
312
  function generateId() {
313
313
  return Math.random().toString(36).substring(2) + Date.now().toString(36);
314
314
  }
315
+ /**
316
+ * Resolve the auth token WITHOUT requiring it on the command line.
317
+ *
318
+ * Anything in argv is world-readable: `ps -ef` (and /proc/<pid>/cmdline, which
319
+ * is mode 0444) shows the full command line of every process on the machine to
320
+ * every local user, so `--token <secret>` leaks the secret to any account on
321
+ * the box. That is fine for a laptop and NOT fine for a shared/bare-metal host,
322
+ * which is why the environment is the preferred channel for real deployments.
323
+ *
324
+ * Precedence, highest first:
325
+ * 1. `--token <value>` - explicit argv, kept for compatibility. LEAKS via ps.
326
+ * 2. `WHEREVER_TOKEN` - preferred for deployments.
327
+ * 3. `WHEREVER_TOKEN_FILE` - path to a file whose (trimmed) CONTENT is the
328
+ * token. The natural shape for a secret manager
329
+ * (sops-nix, systemd `LoadCredential`) which
330
+ * renders a root-owned 0400 file; nothing
331
+ * secret then exists in argv OR in the
332
+ * environment block.
333
+ * 4. `PI_REMOTE_TOKEN` - the pre-existing variable, still honoured.
334
+ *
335
+ * TRIMMING IS ASYMMETRIC ON PURPOSE, and the asymmetry is a compatibility rule,
336
+ * not an oversight. The two NEW sources are trimmed, because a secret manager
337
+ * renders a file with a trailing newline and `WHEREVER_TOKEN=$(cat ...)` is the
338
+ * obvious thing to write. The two PRE-EXISTING sources (`--token`,
339
+ * `PI_REMOTE_TOKEN`) are taken VERBATIM, exactly as before, because
340
+ * `authenticate()` compares the raw query parameter with `===`: trimming them
341
+ * would silently change WHICH string authenticates on an install that already
342
+ * has whitespace in its token, locking out every saved client URL. Likewise
343
+ * `--token` wins whenever the FLAG WAS GIVEN, even with an empty or missing
344
+ * value, because that is what the old `case '--token': token = args[++i]`
345
+ * did -- it overwrote whatever the environment had.
346
+ *
347
+ * An unreadable or empty `WHEREVER_TOKEN_FILE` is FATAL rather than "fall
348
+ * through to no token": silently starting an UNAUTHENTICATED server because a
349
+ * secret failed to mount is the one failure mode that must never happen
350
+ * quietly. Note this only fires when the file is the source actually being
351
+ * consulted: an explicit `--token`/`WHEREVER_TOKEN` above it still wins, and
352
+ * the server is authenticated either way.
353
+ */
354
+ function resolveToken(cliToken, cliTokenGiven) {
355
+ // `cliTokenGiven`, not `cliToken`, so that `--token ''` (and a trailing
356
+ // `--token` with no value) still SUPPRESSES the environment, as it did before.
357
+ if (cliTokenGiven)
358
+ return { token: cliToken || undefined, source: '--token' };
359
+ const envToken = process.env.WHEREVER_TOKEN;
360
+ if (envToken && envToken.trim())
361
+ return { token: envToken.trim(), source: 'WHEREVER_TOKEN' };
362
+ warnIfSetButBlank('WHEREVER_TOKEN', envToken);
363
+ const tokenFile = process.env.WHEREVER_TOKEN_FILE;
364
+ if (tokenFile && tokenFile.trim()) {
365
+ const resolvedPath = expandTilde(tokenFile.trim());
366
+ let contents;
367
+ try {
368
+ contents = fs.readFileSync(resolvedPath, 'utf8');
369
+ }
370
+ catch (err) {
371
+ console.error(`FATAL: WHEREVER_TOKEN_FILE is set to ${resolvedPath} but it could not be read ` +
372
+ `(${err.message}). Refusing to start: continuing would silently run an ` +
373
+ `UNAUTHENTICATED server.`);
374
+ process.exit(1);
375
+ }
376
+ const trimmed = contents.trim();
377
+ if (!trimmed) {
378
+ console.error(`FATAL: WHEREVER_TOKEN_FILE (${resolvedPath}) is empty. Refusing to start: continuing ` +
379
+ `would silently run an UNAUTHENTICATED server.`);
380
+ process.exit(1);
381
+ }
382
+ return { token: trimmed, source: `WHEREVER_TOKEN_FILE (${resolvedPath})` };
383
+ }
384
+ warnIfSetButBlank('WHEREVER_TOKEN_FILE', tokenFile);
385
+ // VERBATIM, including surrounding whitespace: see the trimming note above.
386
+ // `' '` is truthy and therefore enforced, exactly as it was before.
387
+ const legacy = process.env.PI_REMOTE_TOKEN;
388
+ if (legacy)
389
+ return { token: legacy, source: 'PI_REMOTE_TOKEN' };
390
+ return { token: undefined, source: 'none' };
391
+ }
392
+ /**
393
+ * A token variable that is SET but blank is almost always a secret that failed
394
+ * to render (a truncated file, a `$(cat ...)` that errored, a half-landed
395
+ * activation), and the consequence is an UNAUTHENTICATED server that looks
396
+ * perfectly healthy. It cannot be fatal -- `VAR=` is also the ordinary way to
397
+ * neutralise an inherited variable, which the test harness relies on -- so it
398
+ * is made LOUD instead. Silence is the only unacceptable outcome here.
399
+ */
400
+ function warnIfSetButBlank(name, value) {
401
+ if (value === undefined || value.length === 0)
402
+ return; // unset, or explicitly neutralised
403
+ if (value.trim().length > 0)
404
+ return;
405
+ console.warn(`[wherever] ${name} is set but contains only whitespace. Treating it as NOT SET. ` +
406
+ `If a secret was meant to be rendered here, it did not arrive, and this server may ` +
407
+ `be starting WITHOUT AUTHENTICATION.`);
408
+ }
315
409
  function parseArgs() {
316
410
  const args = process.argv.slice(2);
317
411
  let port = parseInt(process.env.PI_REMOTE_PORT || '31415', 10);
318
412
  let host = process.env.PI_REMOTE_HOST || '127.0.0.1';
319
- let token = process.env.PI_REMOTE_TOKEN || undefined;
413
+ // Kept separate from the env-derived token so `resolveToken` below can apply
414
+ // one documented precedence chain instead of "whoever assigned last wins".
415
+ // `cliTokenGiven` tracks the FLAG's presence separately from its VALUE, so
416
+ // `--token ''` still suppresses the environment the way it always did.
417
+ let cliToken = undefined;
418
+ let cliTokenGiven = false;
320
419
  // Idle eviction window. Longer than the old 5 min so a dip-in/dip-out mobile
321
420
  // user returns to a still-WARM session (no agent rebuild) most of the time.
322
421
  // With fast-first load a cold return is no longer slow to READ, but a warm
323
422
  // session also avoids the async agent build entirely. Override via
324
423
  // PI_IDLE_TIMEOUT (ms). See docs/plan-speed-up-long-session-load.md.
325
424
  let idleTimeout = parseInt(process.env.PI_IDLE_TIMEOUT || '1200000', 10);
326
- let sslKey = process.env.PI_REMOTE_SSL_KEY || undefined;
327
- let sslCert = process.env.PI_REMOTE_SSL_CERT || undefined;
425
+ // TLS material is addressed by PATH, and each half is resolved INDEPENDENTLY
426
+ // (flag > WHEREVER_* > PI_REMOTE_*). On a declaratively-managed host the key
427
+ // arrives from a secret manager at an arbitrary root-owned path (e.g.
428
+ // /run/secrets/wherever-key.pem) while the certificate is a world-readable
429
+ // file somewhere else entirely, so neither may be tied to a home directory.
430
+ let sslKey = process.env.WHEREVER_SSL_KEY || process.env.PI_REMOTE_SSL_KEY || undefined;
431
+ let sslCert = process.env.WHEREVER_SSL_CERT || process.env.PI_REMOTE_SSL_CERT || undefined;
328
432
  let noSsl = process.env.PI_REMOTE_NO_SSL === 'true' || process.env.PI_REMOTE_HTTP === 'true';
329
433
  let httpLocalhostFallbackPort = undefined;
330
434
  // Enables the eruda custom-plugin loader in the served dashboard (local
@@ -350,7 +454,8 @@ function parseArgs() {
350
454
  host = args[++i] || '127.0.0.1';
351
455
  break;
352
456
  case '--token':
353
- token = args[++i];
457
+ cliToken = args[++i];
458
+ cliTokenGiven = true;
354
459
  break;
355
460
  case '--idle-timeout':
356
461
  idleTimeout = parseInt(args[++i] || '300000', 10);
@@ -387,7 +492,22 @@ function parseArgs() {
387
492
  }
388
493
  }
389
494
  }
390
- return { port, host, token, idleTimeout, sslKey, sslCert, noSsl, httpLocalhostFallbackPort, debug };
495
+ const { token, source: tokenSource } = resolveToken(cliToken, cliTokenGiven);
496
+ // Scrub the token out of our own environment once it is resolved. Node builds
497
+ // a child's environment from `process.env`, and this server spawns children
498
+ // that are not ours to trust with it: the agent's own `bash` tool
499
+ // (session-pool.ts) and the memonaut indexer (conversation-search.ts) both
500
+ // inherit it, so `!env` typed in the dashboard -- or a prompt-injected agent
501
+ // running `echo $WHEREVER_TOKEN` -- would print the server's auth token into a
502
+ // transcript that is then indexed to disk. The value is already captured in
503
+ // `token` above; nothing reads these variables again.
504
+ delete process.env.WHEREVER_TOKEN;
505
+ delete process.env.PI_REMOTE_TOKEN;
506
+ return { port, host, token, tokenSource, idleTimeout, sslKey, sslCert, noSsl, httpLocalhostFallbackPort, debug };
507
+ }
508
+ /** Loopback-only binds are the safe default; everything else is reachable by others. */
509
+ function isLoopbackHost(host) {
510
+ return host === '127.0.0.1' || host === 'localhost' || host === '::1' || host.startsWith('127.');
391
511
  }
392
512
  function authenticate(req, token) {
393
513
  if (!token)
@@ -482,30 +602,64 @@ function sendThenTerminate(ws, msg, flushTimeoutMs = 1_000) {
482
602
  }
483
603
  }
484
604
  async function main() {
485
- const { port, host, token, idleTimeout, sslKey, sslCert, noSsl, httpLocalhostFallbackPort, debug } = parseArgs();
605
+ const { port, host, token, tokenSource, idleTimeout, sslKey, sslCert, noSsl, httpLocalhostFallbackPort, debug } = parseArgs();
486
606
  debugEnabled = debug;
487
607
  const sessionPool = new SessionPool(idleTimeout);
488
608
  await sessionPool.initialize();
489
609
  const clients = new Map();
490
- let actualSslKey = sslKey;
491
- let actualSslCert = sslCert;
610
+ // expandTilde so `~/certs/...` works from a systemd `Environment=` line or an
611
+ // EnvironmentFile, neither of which is shell-expanded. Without it the read
612
+ // below fails and (before the explicit-TLS check further down) the server
613
+ // quietly served plaintext instead.
614
+ let actualSslKey = sslKey ? expandTilde(sslKey) : sslKey;
615
+ let actualSslCert = sslCert ? expandTilde(sslCert) : sslCert;
492
616
  let isSecure = !noSsl;
617
+ let tlsExplicitlyConfigured = false;
493
618
  if (isSecure) {
619
+ // A key and a certificate only work as a PAIR, so "exactly one supplied" is a
620
+ // misconfiguration. It used to be silent: the `!key || !cert` test threw away
621
+ // the half that WAS supplied and used the self-signed pair, so an operator who
622
+ // pointed --ssl-key at a real key and forgot the cert got a working server
623
+ // presenting a completely different certificate, with nothing in the log. Say
624
+ // so, loudly; the behaviour (fall back to the self-signed pair) is unchanged.
625
+ if (!!actualSslKey !== !!actualSslCert) {
626
+ const supplied = actualSslKey ? '--ssl-key / WHEREVER_SSL_KEY' : '--ssl-cert / WHEREVER_SSL_CERT';
627
+ const missing = actualSslKey ? '--ssl-cert / WHEREVER_SSL_CERT' : '--ssl-key / WHEREVER_SSL_KEY';
628
+ console.warn(`[wherever] ${supplied} was supplied but ${missing} was not. A key and a certificate ` +
629
+ `must be given together; IGNORING the one supplied and using the self-signed pair instead.`);
630
+ actualSslKey = undefined;
631
+ actualSslCert = undefined;
632
+ }
633
+ // Whether the operator POINTED AT specific TLS material, as opposed to
634
+ // letting the server mint its own. It decides what happens if that material
635
+ // cannot be loaded further down: see the `tlsExplicitlyConfigured` branch.
636
+ tlsExplicitlyConfigured = !!(actualSslKey && actualSslCert);
494
637
  if (!actualSslKey || !actualSslCert) {
495
- // Automatic self-signed certificate generation
496
- const homeDir = os.homedir();
497
- const certsDir = path.join(homeDir, '.wherever', 'certs');
638
+ // Automatic self-signed certificate generation. These files are WRITTEN, so
639
+ // they belong to the state dir (WHEREVER_STATE_DIR, defaulting to the config
640
+ // dir, itself defaulting to ~/.wherever) -- with both unset this is exactly
641
+ // the ~/.wherever/certs it has always been.
642
+ const certsDir = getWhereverCertsDir();
643
+ // 0700 on creation: the state dir can now be pointed at a shared location
644
+ // (/var/lib/...), and a world-writable certs dir would let a local user
645
+ // swap in their own key/cert pair. An existing directory keeps its mode.
498
646
  const defaultKeyPath = path.join(certsDir, 'localhost.key');
499
647
  const defaultCertPath = path.join(certsDir, 'localhost.crt');
500
648
  if (!fs.existsSync(defaultKeyPath) || !fs.existsSync(defaultCertPath)) {
501
649
  console.log('Generating self-signed SSL certificates for secure HTTPS/WSS...');
502
650
  try {
503
- fs.mkdirSync(certsDir, { recursive: true });
651
+ fs.mkdirSync(certsDir, { recursive: true, mode: 0o700 });
504
652
  execFileSync('openssl', ['req', '-x509', '-newkey', 'rsa:2048', '-keyout', defaultKeyPath, '-out', defaultCertPath, '-sha256', '-days', '3650', '-nodes', '-subj', '/CN=localhost'], { stdio: 'ignore' });
653
+ // Assert 0600 ourselves rather than trusting openssl's default: it is
654
+ // a private key, and the mode it lands with has varied by version.
655
+ try {
656
+ fs.chmodSync(defaultKeyPath, 0o600);
657
+ }
658
+ catch { }
505
659
  console.log(`Self-signed certificates generated successfully in ${certsDir}`);
506
660
  }
507
661
  catch (err) {
508
- console.warn('Failed to generate self-signed certificates using OpenSSL. Falling back to HTTP.', err.message);
662
+ console.warn(`Failed to generate self-signed certificates in ${certsDir} using OpenSSL. Falling back to HTTP.`, err.message);
509
663
  isSecure = false;
510
664
  }
511
665
  }
@@ -1508,6 +1662,20 @@ async function main() {
1508
1662
  }
1509
1663
  }
1510
1664
  catch (err) {
1665
+ // Falling back to plaintext is only acceptable for material the server
1666
+ // chose for itself. When the operator EXPLICITLY pointed at a key and a
1667
+ // certificate, silently serving HTTP on the same (possibly 0.0.0.0)
1668
+ // address is the same fail-open ADR 0007 rules out for the token file:
1669
+ // it is the exact shape of a secret that has not been decrypted yet, and
1670
+ // clients would then send their token in cleartext to a server that looks
1671
+ // healthy. Refuse to start instead.
1672
+ if (tlsExplicitlyConfigured) {
1673
+ console.error(`FATAL: TLS was explicitly configured (key ${actualSslKey}, cert ${actualSslCert}) but ` +
1674
+ `could not be loaded: ${err.message}. Refusing to start: falling back to ` +
1675
+ `plaintext HTTP would silently expose traffic (and the auth token) on ${host}:${port}. ` +
1676
+ `Pass --no-ssl if plaintext is genuinely what you want.`);
1677
+ process.exit(1);
1678
+ }
1511
1679
  console.error(`Failed to load SSL certificates from ${actualSslKey} and ${actualSslCert}. Falling back to HTTP.`, err.message);
1512
1680
  server = createHttpServer(requestHandler);
1513
1681
  }
@@ -1687,8 +1855,24 @@ async function main() {
1687
1855
  wss.on('close', () => clearInterval(heartbeat));
1688
1856
  server.listen(port, host, () => {
1689
1857
  const protocol = isSecureServer ? 'https' : 'http';
1690
- const authInfo = token ? ' (token-protected)' : ' (no authentication)';
1858
+ // The SOURCE, never the token itself: this line goes to the journal, which
1859
+ // is readable by more people than the secret is.
1860
+ const authInfo = token ? ` (token-protected via ${tokenSource})` : ' (no authentication)';
1691
1861
  console.log(`\n🔐 Wherever Server: ${protocol}://${host}:${port}${authInfo}`);
1862
+ if (token && tokenSource === '--token') {
1863
+ console.warn('[wherever] the token came from the command line, which is visible to every user on this ' +
1864
+ 'machine via `ps`. For a real deployment set WHEREVER_TOKEN (or WHEREVER_TOKEN_FILE) instead.');
1865
+ }
1866
+ // Binding off-loopback with no token is a valid, long-supported choice (it
1867
+ // is how a trusted mesh/VPN setup runs), so it stays permitted. But it is
1868
+ // also exactly what a failed secret render looks like, and the two are
1869
+ // indistinguishable from the outside, so it must not slip by as one
1870
+ // parenthetical word in an otherwise cheerful startup line.
1871
+ if (!token && !isLoopbackHost(host)) {
1872
+ console.warn(`[wherever] WARNING: listening on ${host} with NO AUTHENTICATION. Anyone who can reach ` +
1873
+ `this address has full agent and filesystem access. If you meant to configure a token, ` +
1874
+ `it did not arrive: check WHEREVER_TOKEN / WHEREVER_TOKEN_FILE.`);
1875
+ }
1692
1876
  if (isSecureServer) {
1693
1877
  console.log(`
1694
1878
  👉 FIRST TIME CONNECTING?