@monotykamary/localterm-server 1.41.2 → 1.41.3

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.
@@ -1 +1 @@
1
- {"version":3,"file":"ensure-spawn-helper-executable.d.ts","sourceRoot":"","sources":["../src/ensure-spawn-helper-executable.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,2BAA2B,QAAO,IAmB9C,CAAC"}
1
+ {"version":3,"file":"ensure-spawn-helper-executable.d.ts","sourceRoot":"","sources":["../src/ensure-spawn-helper-executable.ts"],"names":[],"mappings":"AAqEA,eAAO,MAAM,2BAA2B,QAAO,IA+B9C,CAAC"}
@@ -1,5 +1,5 @@
1
- import { chmodSync, existsSync } from "node:fs";
2
- import { execFile } from "node:child_process";
1
+ import { chmodSync, existsSync, statSync } from "node:fs";
2
+ import { execFileSync } from "node:child_process";
3
3
  import { createRequire } from "node:module";
4
4
  import path from "node:path";
5
5
  const requireCjs = createRequire(import.meta.url);
@@ -9,12 +9,59 @@ const candidateSpawnHelperPaths = (nodePtyDir) => [
9
9
  path.join(nodePtyDir, "build", "Release", "spawn-helper"),
10
10
  path.join(nodePtyDir, "prebuilds", `${process.platform}-${process.arch}`, "spawn-helper"),
11
11
  ];
12
- const clearQuarantineAndResign = (target) => {
13
- if (process.platform !== "darwin")
14
- return;
15
- execFile("xattr", ["-d", "com.apple.quarantine", target], { timeout: 5_000 }, () => {
16
- execFile("codesign", ["--force", "--sign", "-", target], { timeout: 10_000 }, () => { });
17
- });
12
+ const isExecutable = (filePath) => {
13
+ try {
14
+ return Boolean(statSync(filePath).mode & 0o111);
15
+ }
16
+ catch {
17
+ return false;
18
+ }
19
+ };
20
+ const hasQuarantine = (target) => {
21
+ try {
22
+ execFileSync("xattr", ["-p", "com.apple.quarantine", target], {
23
+ timeout: 5_000,
24
+ stdio: "pipe",
25
+ });
26
+ return true;
27
+ }
28
+ catch {
29
+ return false;
30
+ }
31
+ };
32
+ const clearQuarantine = (target) => {
33
+ try {
34
+ execFileSync("xattr", ["-d", "com.apple.quarantine", target], {
35
+ timeout: 5_000,
36
+ stdio: "ignore",
37
+ });
38
+ }
39
+ catch {
40
+ // xattr not present or quarantine already cleared
41
+ }
42
+ };
43
+ const hasValidSignature = (target) => {
44
+ try {
45
+ execFileSync("codesign", ["--verify", target], {
46
+ timeout: 10_000,
47
+ stdio: "ignore",
48
+ });
49
+ return true;
50
+ }
51
+ catch {
52
+ return false;
53
+ }
54
+ };
55
+ const adHocSign = (target) => {
56
+ try {
57
+ execFileSync("codesign", ["--force", "--sign", "-", target], {
58
+ timeout: 10_000,
59
+ stdio: "ignore",
60
+ });
61
+ }
62
+ catch {
63
+ // codesign unavailable; the binary may still work if not quarantined
64
+ }
18
65
  };
19
66
  export const ensureSpawnHelperExecutable = () => {
20
67
  if (alreadyEnsured)
@@ -31,13 +78,22 @@ export const ensureSpawnHelperExecutable = () => {
31
78
  for (const candidate of candidateSpawnHelperPaths(nodePtyDir)) {
32
79
  if (!existsSync(candidate))
33
80
  continue;
34
- try {
35
- chmodSync(candidate, SPAWN_HELPER_MODE);
81
+ if (!isExecutable(candidate)) {
82
+ try {
83
+ chmodSync(candidate, SPAWN_HELPER_MODE);
84
+ }
85
+ catch {
86
+ // filesystem refused chmod (e.g. read-only mount)
87
+ }
88
+ }
89
+ if (process.platform !== "darwin")
90
+ continue;
91
+ if (hasQuarantine(candidate)) {
92
+ clearQuarantine(candidate);
36
93
  }
37
- catch {
38
- /* helper already executable, or filesystem refused chmod (e.g. read-only mount) */
94
+ if (!hasValidSignature(candidate)) {
95
+ adHocSign(candidate);
39
96
  }
40
- clearQuarantineAndResign(candidate);
41
97
  }
42
98
  };
43
99
  //# sourceMappingURL=ensure-spawn-helper-executable.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ensure-spawn-helper-executable.js","sourceRoot":"","sources":["../src/ensure-spawn-helper-executable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,iBAAiB,GAAG,KAAK,CAAC;AAEhC,IAAI,cAAc,GAAG,KAAK,CAAC;AAE3B,MAAM,yBAAyB,GAAG,CAAC,UAAkB,EAAY,EAAE,CAAC;IAClE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,CAAC;IACzD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,cAAc,CAAC;CAC1F,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,MAAc,EAAQ,EAAE;IACxD,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ;QAAE,OAAO;IAC1C,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,sBAAsB,EAAE,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE;QACjF,QAAQ,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC1F,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,GAAS,EAAE;IACpD,IAAI,cAAc;QAAE,OAAO;IAC3B,cAAc,GAAG,IAAI,CAAC;IACtB,IAAI,UAAkB,CAAC;IACvB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAChD,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;IACT,CAAC;IACD,KAAK,MAAM,SAAS,IAAI,yBAAyB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9D,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;YAAE,SAAS;QACrC,IAAI,CAAC;YACH,SAAS,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAC1C,CAAC;QAAC,MAAM,CAAC;YACP,mFAAmF;QACrF,CAAC;QACD,wBAAwB,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;AACH,CAAC,CAAC"}
1
+ {"version":3,"file":"ensure-spawn-helper-executable.js","sourceRoot":"","sources":["../src/ensure-spawn-helper-executable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,iBAAiB,GAAG,KAAK,CAAC;AAEhC,IAAI,cAAc,GAAG,KAAK,CAAC;AAE3B,MAAM,yBAAyB,GAAG,CAAC,UAAkB,EAAY,EAAE,CAAC;IAClE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,CAAC;IACzD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,cAAc,CAAC;CAC1F,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAW,EAAE;IACjD,IAAI,CAAC;QACH,OAAO,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;IAClD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,MAAc,EAAW,EAAE;IAChD,IAAI,CAAC;QACH,YAAY,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,sBAAsB,EAAE,MAAM,CAAC,EAAE;YAC5D,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,MAAc,EAAQ,EAAE;IAC/C,IAAI,CAAC;QACH,YAAY,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,sBAAsB,EAAE,MAAM,CAAC,EAAE;YAC5D,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,QAAQ;SAChB,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,kDAAkD;IACpD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAW,EAAE;IACpD,IAAI,CAAC;QACH,YAAY,CAAC,UAAU,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE;YAC7C,OAAO,EAAE,MAAM;YACf,KAAK,EAAE,QAAQ;SAChB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,MAAc,EAAQ,EAAE;IACzC,IAAI,CAAC;QACH,YAAY,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE;YAC3D,OAAO,EAAE,MAAM;YACf,KAAK,EAAE,QAAQ;SAChB,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,qEAAqE;IACvE,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,GAAS,EAAE;IACpD,IAAI,cAAc;QAAE,OAAO;IAC3B,cAAc,GAAG,IAAI,CAAC;IACtB,IAAI,UAAkB,CAAC;IACvB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAChD,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;IACT,CAAC;IACD,KAAK,MAAM,SAAS,IAAI,yBAAyB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9D,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;YAAE,SAAS;QAErC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC;gBACH,SAAS,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;YAC1C,CAAC;YAAC,MAAM,CAAC;gBACP,kDAAkD;YACpD,CAAC;QACH,CAAC;QAED,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ;YAAE,SAAS;QAE5C,IAAI,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,eAAe,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC;YAClC,SAAS,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;AACH,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@monotykamary/localterm-server",
3
- "version": "1.41.2",
3
+ "version": "1.41.3",
4
4
  "description": "PTY-backed HTTP/WebSocket server that powers localterm, built on Hono + node-pty.",
5
5
  "keywords": [
6
6
  "hono",
@@ -72,6 +72,6 @@
72
72
  "build": "tsc -p tsconfig.build.json",
73
73
  "dev": "tsc -p tsconfig.build.json --watch",
74
74
  "test": "vp test --run",
75
- "typecheck": "tsc --noEmit"
75
+ "typecheck": "tsc -p tsconfig.build.json --noEmit"
76
76
  }
77
77
  }