jishushell 0.6.18 → 0.7.3

package/node_modules/jishushell-panel/output/public/index.html

@@ -9,10 +9,10 @@
          from the instance cards, making the panel look like Hermes. -->
     <link rel="icon" type="image/png" href="/favicon.png" />
     <title>JishuShell</title>
-    <script type="module" crossorigin src="/assets/index-ERt6_ngA.js"></script>
+    <script type="module" crossorigin src="/assets/index-Bs6DSbiR.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-QTnfLwEv.js">
-    <link rel="modulepreload" crossorigin href="/assets/vendor-i18n-CS8DFbkQ.js">
-    <link rel="modulepreload" crossorigin href="/assets/vendor-react-Cc84NArf.js">
+    <link rel="modulepreload" crossorigin href="/assets/vendor-i18n-Df8aUdv8.js">
+    <link rel="modulepreload" crossorigin href="/assets/vendor-react-0L0rjmYG.js">
     <link rel="modulepreload" crossorigin href="/assets/api-C70Gt678.js">
     <link rel="stylesheet" crossorigin href="/assets/index-DnnqTf7s.css">
   </head>

package/node_modules/jishushell-panel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jishushell-panel",
-  "version": "0.6.18",
+  "version": "0.7.3",
   "jishushellCoreMinVersion": "0.5.28",
   "description": "JishuShell panel server and web frontend",
   "type": "module",

package/node_modules/semver/classes/range.js

@@ -299,6 +299,10 @@ const replaceTildes = (comp, options) => {
 
 const replaceTilde = (comp, options) => {
   const r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE]
+  // if we're including prereleases in the match, then the lower bound is
+  // -0, the lowest possible prerelease value, just like x-ranges and carets.
+  // this keeps `~1.2` equivalent to the `1.2.x` x-range it's documented as.
+  const z = options.includePrerelease ? '-0' : ''
   return comp.replace(r, (_, M, m, p, pr) => {
     debug('tilde', comp, _, M, m, p, pr)
     let ret
@@ -306,10 +310,10 @@ const replaceTilde = (comp, options) => {
     if (isX(M)) {
       ret = ''
     } else if (isX(m)) {
-      ret = `>=${M}.0.0 <${+M + 1}.0.0-0`
+      ret = `>=${M}.0.0${z} <${+M + 1}.0.0-0`
     } else if (isX(p)) {
       // ~1.2 == >=1.2.0 <1.3.0-0
-      ret = `>=${M}.${m}.0 <${M}.${+m + 1}.0-0`
+      ret = `>=${M}.${m}.0${z} <${M}.${+m + 1}.0-0`
     } else if (pr) {
       debug('replaceTilde pr', pr)
       ret = `>=${M}.${m}.${p}-${pr

package/node_modules/semver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "semver",
-  "version": "7.8.4",
+  "version": "7.8.5",
   "description": "The semantic version parser used by npm.",
   "main": "index.js",
   "scripts": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jishushell",
-  "version": "0.6.18",
+  "version": "0.7.3",
   "description": "JishuShell — Raspberry Pi server management panel (Core + Web UI)",
   "type": "module",
   "jishushellPanel": {
@@ -28,7 +28,7 @@
     "openclaw-entry.sh",
     "INSTALL-NOTICE",
     "THIRD-PARTY-NOTICES",
-    "dependencies/jishushell-panel-0.6.18.tgz"
+    "dependencies/jishushell-panel-0.7.3.tgz"
   ],
   "scripts": {
     "build": "npm install && npm run compile:backend",
@@ -62,7 +62,7 @@
     "build:pack": "npm run build && npm pack",
     "build:pack:cli": "npm run build:pack",
     "build:pack:gui": "npm run build && node scripts/pack-with-gui.mjs",
-    "check:contracts": "node --experimental-strip-types scripts/check-integration-isolation.ts && node scripts/check-app-path-boundaries.mjs && node scripts/check-open-core-boundaries.mjs && node scripts/check-colima-launchd.mjs",
+    "check:contracts": "node --experimental-strip-types scripts/check-integration-isolation.ts && node scripts/check-app-path-boundaries.mjs && node scripts/check-architecture-boundaries.mjs && node scripts/check-open-core-boundaries.mjs && node scripts/check-colima-launchd.mjs",
     "check:open-core-boundaries": "node scripts/check-open-core-boundaries.mjs",
     "check:i18n": "echo 'i18n checks live in sibling repo ../jishushell-panel.'",
     "check:app-spec": "node scripts/check-app-spec.mjs",
@@ -95,7 +95,7 @@
     "jsonwebtoken": "^9.0.2",
     "systeminformation": "^5.23.0",
     "yaml": "^2.8.3",
-    "jishushell-panel": "file:dependencies/jishushell-panel-0.6.18.tgz"
+    "jishushell-panel": "file:dependencies/jishushell-panel-0.7.3.tgz"
   },
   "optionalDependencies": {
     "macos-temperature-sensor": "^1.0.4"

package/scripts/check-app-spec.mjs

@@ -4,7 +4,7 @@
  *
  * Three provide classes:
  *   A. Bindable category   — capability has CAPABILITY_CATEGORIES prefix
- *      (`llm-` / `search-` / `browser-` / `mcp-`). Must declare task,
+ *      (`llm-` / `search-` / `browser-`). Must declare task,
  *      port (resolvable to a task port via host_port ?? port), protocol
  *      from category whitelist, optional health, description.
  *   B. Legacy bindable exact — capability is in LEGACY_BINDABLE_EXACT_ALLOWLIST
@@ -34,14 +34,13 @@ const APPS_DIR = process.env.APPS_DIR_OVERRIDE ?? join(__dirname, "..", "apps");
 // deliberately small and closed: provider app ids stay free-form, but
 // matching protocol must be explicit and statically checkable.
 const CAPABILITY_CATEGORIES = new Set([
-  "llm", "search", "browser", "mcp", "files", "knowledge", "ui", "terminal",
+  "llm", "search", "browser", "files", "knowledge", "ui", "terminal",
 ]);
 
 const INTERFACES_BY_KIND = {
   llm: new Set(["openai-compatible"]),
   search: new Set(["searxng-json"]),
   browser: new Set(["cdp-ws"]),
-  mcp: new Set(["mcp-http", "mcp-sse", "mcp-stdio"]),
   files: new Set(["web-file-manager"]),
   knowledge: new Set(["kb-search"]),
   ui: new Set(["web-ui"]),
@@ -68,7 +67,6 @@ const PROTOCOL_WHITELIST = {
   llm: new Set(["http", "https"]),
   search: new Set(["http", "https"]),
   browser: new Set(["ws", "wss", "http", "https"]),
-  mcp: new Set(["http", "https", "ws", "sse"]),
   // Filebrowser exposes an HTTP Web UI under /apps/filebrowser; webdav adds
   // PROPFIND/PUT over the same HTTP origin. Both fit `http(s)`.
   files: new Set(["http", "https"]),
@@ -99,12 +97,6 @@ function inferLegacyInterface(kind, capability, protocol) {
     case "knowledge": return "kb-search";
     case "ui": return "web-ui";
     case "terminal": return "terminal";
-    case "mcp": {
-      const normalized = typeof protocol === "string" ? protocol.trim().toLowerCase() : "";
-      if (normalized === "sse") return "mcp-sse";
-      if (normalized === "stdio") return "mcp-stdio";
-      return "mcp-http";
-    }
     default: return null;
   }
 }
@@ -440,8 +432,8 @@ for (const { file, spec } of specs) {
 
     // ── §17 (PR 8): tool_schema validation — applies to any bindable
     //    capability that an LLM integration hook may turn into an MCP
-    //    server entry (i.e. category A search-/mcp-, plus any future
-    //    bindable cap). Warn-only this release; promoted to err in v0.5.
+    //    server entry (i.e. category A search-, plus any future bindable
+    //    cap). Warn-only this release; promoted to err in v0.5.
     if (provide.tool_schema !== undefined) {
       const ts = provide.tool_schema;
       if (typeof ts !== "object" || ts === null) {

package/scripts/check-architecture-boundaries.mjs

@@ -0,0 +1,178 @@
+#!/usr/bin/env node
+/**
+ * Guard high-risk architecture boundaries that AI/codegen commonly crosses.
+ *
+ * These are intentionally small string checks. They do not prove correctness;
+ * they catch the easy regressions before review:
+ *   - writing instance.json outside canonical writers
+ *   - bringing install-time port shifting back into the AppSpec materializer
+ *   - adding product-specific code to the generic instances route
+ */
+
+import { readdirSync, readFileSync, statSync } from "node:fs";
+import { relative, resolve, sep } from "node:path";
+
+const REPO_ROOT = resolve(import.meta.dirname ?? ".", "..");
+const SRC_ROOT = resolve(REPO_ROOT, "src");
+
+const ALLOWED_INSTANCE_METADATA_WRITERS = new Set([
+  "src/services/app-common/create-pipeline.ts",
+  "src/services/app-common/instance-store.ts",
+  "src/services/instances/manager.ts",
+]);
+
+const INSTANCE_METADATA_WRITE_PATTERNS = [
+  /\bsafeWriteJson\s*\(\s*[^;\n]*(?:INSTANCE_METADATA_FILENAME|instanceMetaPath\s*\(|["']instance\.json["'])/,
+  /\bwriteFileSync\s*\(\s*[^;\n]*(?:INSTANCE_METADATA_FILENAME|instanceMetaPath\s*\(|["']instance\.json["'])/,
+  /\bsafeWriteJson\s*\(\s*(?:metaPath|instancePath)\b/,
+  /\bwriteFileSync\s*\(\s*(?:metaPath|instancePath)\b/,
+];
+
+const MATERIALIZER_FORBIDDEN_PATTERNS = [
+  {
+    pattern: /\bcollectDeclaredPorts\b/,
+    rule: "install materializer must not collect AppSpec ports for conflict checks",
+  },
+  {
+    pattern: /\bbuildPortShiftMap\b|\bportShift(?:Map)?\b/,
+    rule: "install materializer must not shift AppSpec port values",
+  },
+  {
+    pattern: /\breplacePortTokens\b/,
+    rule: "install materializer must not rewrite arbitrary YAML strings/numbers as ports",
+  },
+  {
+    pattern: /\bisPortInUse\s*\(/,
+    rule: "port availability belongs to the Core runtime allocator, not install materialization",
+  },
+];
+
+const INSTANCE_ROUTE_PRODUCT_PATTERNS = [
+  {
+    pattern: /\bopenclaw\b/i,
+    rule: "OpenClaw-specific HTTP behavior belongs in src/services/integrations/openclaw",
+  },
+  {
+    pattern: /\bhermes\b/i,
+    rule: "Hermes-specific HTTP behavior belongs in src/services/integrations/hermes",
+  },
+  {
+    pattern: /\bjishukb\b|\bjishu-kb\b/i,
+    rule: "JishuKB-specific HTTP behavior belongs in its integration/app boundary",
+  },
+  {
+    pattern: /\banythingllm\b/i,
+    rule: "AnythingLLM-specific HTTP behavior belongs in its integration/app boundary",
+  },
+  {
+    pattern: /\bbrowserless\b/i,
+    rule: "Browserless-specific HTTP behavior belongs in app-modules/browserless",
+  },
+];
+
+function isSourceFile(path) {
+  return path.endsWith(".ts") && !path.endsWith(".d.ts");
+}
+
+function* walk(dir) {
+  for (const entry of readdirSync(dir)) {
+    const full = resolve(dir, entry);
+    const stat = statSync(full);
+    if (stat.isDirectory()) {
+      yield* walk(full);
+    } else if (stat.isFile() && isSourceFile(full)) {
+      yield full;
+    }
+  }
+}
+
+function relPath(abs) {
+  return relative(REPO_ROOT, abs).split(sep).join("/");
+}
+
+function isCommentLine(line) {
+  const trimmed = line.trimStart();
+  return trimmed.startsWith("//") || trimmed.startsWith("*") || trimmed.startsWith("/*");
+}
+
+function lineNumberAt(content, index) {
+  return content.slice(0, index).split("\n").length;
+}
+
+const violations = [];
+
+for (const abs of walk(SRC_ROOT)) {
+  const rel = relPath(abs);
+  if (rel.includes("/legacy-migrator/") || rel.includes("/repair/")) continue;
+
+  const content = readFileSync(abs, "utf-8");
+  const allowedInstanceWriter = ALLOWED_INSTANCE_METADATA_WRITERS.has(rel);
+
+  if (!allowedInstanceWriter) {
+    for (const pattern of INSTANCE_METADATA_WRITE_PATTERNS) {
+      const re = new RegExp(pattern.source, "g");
+      let match;
+      while ((match = re.exec(content)) !== null) {
+        violations.push({
+          file: rel,
+          line: lineNumberAt(content, match.index),
+          rule: "instance-metadata-write-boundary",
+          detail: "Write instance.json through canonical instance-store/instances manager helpers.",
+          text: match[0],
+        });
+      }
+    }
+  }
+}
+
+{
+  const file = "src/services/app-common/spec-materializer.ts";
+  const content = readFileSync(resolve(REPO_ROOT, file), "utf-8");
+  const lines = content.split("\n");
+  for (let i = 0; i < lines.length; i += 1) {
+    const line = lines[i];
+    if (isCommentLine(line)) continue;
+    for (const { pattern, rule } of MATERIALIZER_FORBIDDEN_PATTERNS) {
+      if (!pattern.test(line)) continue;
+      violations.push({
+        file,
+        line: i + 1,
+        rule: "install-port-materializer-boundary",
+        detail: rule,
+        text: line.trim(),
+      });
+    }
+  }
+}
+
+{
+  const file = "src/routes/instances.ts";
+  const content = readFileSync(resolve(REPO_ROOT, file), "utf-8");
+  const lines = content.split("\n");
+  for (let i = 0; i < lines.length; i += 1) {
+    const line = lines[i];
+    if (isCommentLine(line)) continue;
+    for (const { pattern, rule } of INSTANCE_ROUTE_PRODUCT_PATTERNS) {
+      if (!pattern.test(line)) continue;
+      violations.push({
+        file,
+        line: i + 1,
+        rule: "instance-route-product-boundary",
+        detail: rule,
+        text: line.trim().slice(0, 160),
+      });
+    }
+  }
+}
+
+if (violations.length > 0) {
+  console.error(`check-architecture-boundaries FAILED: ${violations.length} violation(s)\n`);
+  for (const violation of violations) {
+    console.error(`  ${violation.file}:${violation.line} [${violation.rule}]`);
+    console.error(`    ${violation.detail}`);
+    console.error(`    ${violation.text}`);
+  }
+  process.exit(1);
+}
+
+console.log("check-architecture-boundaries OK");

package/scripts/pack-gui-and-send-pi.sh

@@ -3,10 +3,12 @@ set -euo pipefail
 
 PANEL_ROOT="/home/eriyu01/work/jishushell-panel"
 CORE_ROOT="/home/eriyu01/work/jishushell"
-VERSION="0.6.16"
 
-PANEL_TARBALL_NAME="jishushell-panel-${VERSION}.tgz"
-CORE_TARBALL_NAME="jishushell-${VERSION}.tgz"
+PANEL_VERSION="$(node -p "require('${PANEL_ROOT}/package.json').version")"
+CORE_VERSION="$(node -p "require('${CORE_ROOT}/package.json').version")"
+
+PANEL_TARBALL_NAME="jishushell-panel-${PANEL_VERSION}.tgz"
+CORE_TARBALL_NAME="jishushell-${CORE_VERSION}.tgz"
 
 PANEL_TARBALL="${PANEL_ROOT}/${PANEL_TARBALL_NAME}"
 CORE_PANEL_TARBALL="${CORE_ROOT}/dependencies/${PANEL_TARBALL_NAME}"

package/dist/services/connections/suggestions.d.ts

@@ -1,27 +0,0 @@
-export interface ConnectionSuggestion {
-    id: string;
-    consumerInstanceId: string;
-    consumerName: string;
-    instanceId: string;
-    slot: string;
-    capability: string;
-    candidate: {
-        providerId: string;
-        capability: string;
-        name?: string;
-        protocol: string;
-        status: string;
-        hostPort: number;
-        path?: string;
-    };
-    reason: string;
-}
-export declare function computeSuggestions(): ConnectionSuggestion[];
-/**
- * Mark a suggestion as dismissed. Persisted on the consumer instance so
- * subsequent computeSuggestions() invocations skip it for the TTL window.
- *
- * `id` follows the format `${consumerInstanceId}::${slot}::...` — the
- * leading two segments are enough to identify the slot to dismiss.
- */
-export declare function dismissSuggestion(id: string): Promise<void>;

package/dist/services/connections/suggestions.js

@@ -1,124 +0,0 @@
-/**
- * Panel-only Suggestions engine — scans every app instance for unbound `requires`
- * slots that *could* be filled from the current capability registry, and
- * emits one suggestion per (consumer, slot, candidate). The Dashboard
- * polls this so the user gets a low-friction "you can connect X to Y"
- * prompt without having to dig into each instance.
- *
- * Dismissals are stored on the consumer's `instance.json.dismissedSuggestions`
- * (per-slot, 30-day TTL).
- */
-import * as capabilityRegistry from "../capabilities/registry.js";
-import * as instanceManager from "../instances/manager.js";
-import { getInstanceInstallRecord } from "../app-common/service.js";
-import { resolveConnections } from "./resolver.js";
-import { capabilityMatchesRequire } from "../capabilities/contract.js";
-import { readCanonicalSpecForInstance } from "../app-common/instance-store.js";
-import { resolveExecutionOwnerFromMetadata } from "../app-common/execution-owner.js";
-import { getIntegration } from "../integrations/index.js";
-import { safeReadJson, safeWriteJson } from "../../utils/safe-json.js";
-const DISMISS_TTL_MS = 30 * 24 * 60 * 60 * 1000;
-export function computeSuggestions() {
-    const out = [];
-    const allInstances = instanceManager.listInstances();
-    for (const inst of allInstances) {
-        const instanceId = String(inst.id ?? "");
-        let spec = getInstanceInstallRecord(instanceId)?.spec ?? null;
-        if (!spec) {
-            spec = readCanonicalSpecForInstance(instanceId);
-            if (!spec)
-                continue;
-        }
-        const persisted = (inst.connections ?? {});
-        const dismissed = (inst.dismissedSuggestions ?? []);
-        const dismissedSlots = new Set(dismissed
-            .filter((d) => new Date(d.until).getTime() > Date.now())
-            .map((d) => d.slot));
-        let pending = [];
-        try {
-            const r = resolveConnections(spec, { connections: persisted }, "preCreate");
-            pending = r.pending;
-        }
-        catch {
-            continue;
-        }
-        for (const p of pending) {
-            if (dismissedSlots.has(p.slot))
-                continue;
-            const req = (spec.requires ?? []).find((item) => item.inject_as === p.slot);
-            if (!req)
-                continue;
-            const candidates = enumerateCandidates(req);
-            // Same agent-on-agent guard as the Connections-tab dropdown: agent
-            // consumers of `llm` should never be offered another agent's
-            // `llm-agent` (would chain agent → agent → real model).
-            const owner = resolveExecutionOwnerFromMetadata(instanceId, inst);
-            const consumerIsAgent = owner.type === "integration"
-                && getIntegration(owner.integrationKind).manifest?.connectionRole === "agent";
-            const running = candidates.filter((e) => {
-                if (e.status !== "running")
-                    return false;
-                if (e.instanceId === inst.id)
-                    return false;
-                if (consumerIsAgent && req.capability === "llm" && e.capability === "llm-agent")
-                    return false;
-                return true;
-            });
-            if (running.length === 0)
-                continue;
-            // Single candidate → suggest it; multiple → suggest the running ones.
-            const top = running[0];
-            out.push({
-                id: `${inst.id}::${p.slot}::${top.instanceId}::${top.capability}`,
-                consumerInstanceId: inst.id,
-                consumerName: inst.name ?? inst.id,
-                instanceId,
-                slot: p.slot,
-                capability: p.capability,
-                candidate: {
-                    providerId: top.instanceId,
-                    capability: top.capability,
-                    name: top.name,
-                    protocol: top.protocol,
-                    status: top.status,
-                    hostPort: top.hostPort,
-                    path: top.path,
-                },
-                reason: p.reason,
-            });
-        }
-    }
-    return out;
-}
-function enumerateCandidates(req) {
-    const file = capabilityRegistry.snapshot();
-    const out = [];
-    for (const list of Object.values(file.providersByCapability ?? {})) {
-        for (const entry of list) {
-            if (capabilityMatchesRequire(req, entry))
-                out.push(entry);
-        }
-    }
-    return out;
-}
-/**
- * Mark a suggestion as dismissed. Persisted on the consumer instance so
- * subsequent computeSuggestions() invocations skip it for the TTL window.
- *
- * `id` follows the format `${consumerInstanceId}::${slot}::...` — the
- * leading two segments are enough to identify the slot to dismiss.
- */
-export async function dismissSuggestion(id) {
-    const parts = id.split("::");
-    if (parts.length < 2)
-        throw new Error(`Invalid suggestion id: ${id}`);
-    const [consumerInstanceId, slot] = parts;
-    const path = instanceManager.instanceMetaPath(consumerInstanceId);
-    const cur = (safeReadJson(path, `instance:${consumerInstanceId}`) ?? {});
-    const list = Array.isArray(cur.dismissedSuggestions) ? cur.dismissedSuggestions : [];
-    const filtered = list.filter((d) => d.slot !== slot);
-    filtered.push({ slot, until: new Date(Date.now() + DISMISS_TTL_MS).toISOString() });
-    cur.dismissedSuggestions = filtered;
-    safeWriteJson(path, cur);
-}
-//# sourceMappingURL=suggestions.js.map

package/dist/services/connections/suggestions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"suggestions.js","sourceRoot":"","sources":["../../../src/services/connections/suggestions.ts"],"names":[],"mappings":"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"}

package/node_modules/fastify/test/types/content-type-parser.test-d.ts

@@ -1,72 +0,0 @@
-import fastify, { FastifyBodyParser } from '../../fastify'
-import { expectError, expectType } from 'tsd'
-import { IncomingMessage } from 'node:http'
-import { FastifyRequest } from '../../types/request'
-
-expectType<void>(fastify().addContentTypeParser('contentType', function (request, payload, done) {
-  expectType<FastifyRequest>(request)
-  expectType<IncomingMessage>(payload)
-  done(null)
-}))
-
-// Body limit options
-
-expectType<void>(fastify().addContentTypeParser('contentType', { bodyLimit: 99 }, function (request, payload, done) {
-  expectType<FastifyRequest>(request)
-  expectType<IncomingMessage>(payload)
-  done(null)
-}))
-
-// Array for contentType
-
-expectType<void>(fastify().addContentTypeParser(['contentType'], function (request, payload, done) {
-  expectType<FastifyRequest>(request)
-  expectType<IncomingMessage>(payload)
-  done(null)
-}))
-
-// Body Parser - the generic after addContentTypeParser enforces the type of the `body` parameter as well as the value of the `parseAs` property
-
-expectType<void>(fastify().addContentTypeParser<string>('bodyContentType', { parseAs: 'string' }, function (request, body, done) {
-  expectType<FastifyRequest>(request)
-  expectType<string>(body)
-  done(null)
-}))
-
-expectType<void>(fastify().addContentTypeParser<Buffer>('bodyContentType', { parseAs: 'buffer' }, function (request, body, done) {
-  expectType<FastifyRequest>(request)
-  expectType<Buffer>(body)
-  done(null)
-}))
-
-expectType<void>(fastify().addContentTypeParser('contentType', async function (request: FastifyRequest, payload: IncomingMessage) {
-  expectType<FastifyRequest>(request)
-  expectType<IncomingMessage>(payload)
-  return null
-}))
-
-expectType<void>(fastify().addContentTypeParser<string>('bodyContentType', { parseAs: 'string' }, async function (request: FastifyRequest, body: string) {
-  expectType<FastifyRequest>(request)
-  expectType<string>(body)
-  return null
-}))
-
-expectType<void>(fastify().addContentTypeParser<Buffer>('bodyContentType', { parseAs: 'buffer' }, async function (request: FastifyRequest, body: Buffer) {
-  expectType<FastifyRequest>(request)
-  expectType<Buffer>(body)
-  return null
-}))
-
-expectType<FastifyBodyParser<string>>(fastify().getDefaultJsonParser('error', 'ignore'))
-
-expectError(fastify().getDefaultJsonParser('error', 'skip'))
-
-expectError(fastify().getDefaultJsonParser('nothing', 'ignore'))
-
-expectType<void>(fastify().removeAllContentTypeParsers())
-expectError(fastify().removeAllContentTypeParsers('contentType'))
-
-expectType<void>(fastify().removeContentTypeParser('contentType'))
-expectType<void>(fastify().removeContentTypeParser(/contentType+.*/))
-expectType<void>(fastify().removeContentTypeParser(['contentType', /contentType+.*/]))
-expectError(fastify().removeContentTypeParser({}))