csdn-im 0.1.8 → 0.1.9

package/dist/index.cjs

@@ -4492,73 +4492,137 @@ var import_node_fs = require("fs");
 var import_node_module = require("module");
 var import_node_path = require("path");
 var import_node_url = require("url");
-function findRequireAnchorPackageJson() {
-  let dir = process.cwd();
-  for (let i = 0; i < 8; i++) {
-    const pkg = (0, import_node_path.join)(dir, "package.json");
-    if ((0, import_node_fs.existsSync)(pkg)) return pkg;
-    const parent = (0, import_node_path.dirname)(dir);
-    if (parent === dir) break;
-    dir = parent;
-  }
-  throw new Error(
-    `${CSDN_LOG_TAG} loadOpenclawPluginSdk: no package.json found walking up from process.cwd(); cannot createRequire for openclaw fallback`
-  );
-}
-var OPENCLAW_SEARCH_ROOTS = [
+var NODE_MODULES_OPENCLAW = (0, import_node_path.join)("node_modules", "openclaw", "package.json");
+var LEGACY_RESOLVE_ROOTS = [
   process.cwd(),
   (0, import_node_path.join)(process.cwd(), ".."),
   (0, import_node_path.join)(process.cwd(), "..", ".."),
   (0, import_node_path.join)(process.cwd(), "packages", "csdn"),
   (0, import_node_path.join)(process.cwd(), "..", "packages", "csdn")
 ];
-async function importOpenclawPluginSdkFromDisk() {
-  const require2 = (0, import_node_module.createRequire)(findRequireAnchorPackageJson());
-  for (const root of OPENCLAW_SEARCH_ROOTS) {
-    try {
-      const mainEntry = require2.resolve("openclaw", { paths: [root] });
-      const pkgRoot = (0, import_node_path.join)((0, import_node_path.dirname)(mainEntry), "..");
-      const sdkEntry = (0, import_node_path.join)(pkgRoot, "dist", "plugin-sdk", "index.js");
-      return await import((0, import_node_url.pathToFileURL)(sdkEntry).href);
-    } catch {
+function tryResolveOpenclawRootWithRequire(anchorFile) {
+  try {
+    const req = (0, import_node_module.createRequire)(anchorFile);
+    let d = (0, import_node_path.dirname)(req.resolve("openclaw"));
+    for (let i = 0; i < 8; i++) {
+      if ((0, import_node_fs.existsSync)((0, import_node_path.join)(d, "package.json")) && (0, import_node_fs.existsSync)((0, import_node_path.join)(d, "dist", "plugin-sdk", "index.js"))) {
+        return d;
+      }
+      const parent = (0, import_node_path.dirname)(d);
+      if (parent === d) break;
+      d = parent;
     }
+  } catch {
+    return void 0;
   }
-  throw new Error(`${CSDN_LOG_TAG} could not resolve openclaw from disk`);
+  return void 0;
 }
-async function importOpenclawReplyRuntimeFromDisk() {
-  const require2 = (0, import_node_module.createRequire)(findRequireAnchorPackageJson());
-  for (const root of OPENCLAW_SEARCH_ROOTS) {
-    try {
-      const mainEntry = require2.resolve("openclaw", { paths: [root] });
-      const pkgRoot = (0, import_node_path.join)((0, import_node_path.dirname)(mainEntry), "..");
-      const entry = (0, import_node_path.join)(pkgRoot, "dist", "plugin-sdk", "reply-runtime.js");
-      return await import((0, import_node_url.pathToFileURL)(entry).href);
-    } catch {
+function scanUpFromEntryMain(main) {
+  const fromEntry = tryResolveOpenclawRootWithRequire(main);
+  if (fromEntry) return fromEntry;
+  let dir = (0, import_node_path.dirname)(main);
+  for (let i = 0; i < 48; i++) {
+    const pkgJson = (0, import_node_path.join)(dir, "package.json");
+    if ((0, import_node_fs.existsSync)(pkgJson)) {
+      const hit = tryResolveOpenclawRootWithRequire(pkgJson);
+      if (hit) return hit;
+    }
+    const direct = (0, import_node_path.join)(dir, NODE_MODULES_OPENCLAW);
+    if ((0, import_node_fs.existsSync)(direct)) return (0, import_node_path.dirname)(direct);
+    const parent = (0, import_node_path.dirname)(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return void 0;
+}
+function listEntryAnchorScripts() {
+  const out = [];
+  const a = process.argv[1];
+  if (a && (0, import_node_fs.existsSync)(a)) out.push(a);
+  try {
+    const mainFn = typeof require !== "undefined" ? require.main?.filename : void 0;
+    if (mainFn && (0, import_node_fs.existsSync)(mainFn) && mainFn !== a) out.push(mainFn);
+  } catch {
+  }
+  return out;
+}
+function resolveOpenclawPackageRoot() {
+  for (const main of listEntryAnchorScripts()) {
+    const hit = scanUpFromEntryMain(main);
+    if (hit) return hit;
+  }
+  let cwd = process.cwd();
+  for (let i = 0; i < 48; i++) {
+    const direct = (0, import_node_path.join)(cwd, NODE_MODULES_OPENCLAW);
+    if ((0, import_node_fs.existsSync)(direct)) return (0, import_node_path.dirname)(direct);
+    const parent = (0, import_node_path.dirname)(cwd);
+    if (parent === cwd) break;
+    cwd = parent;
+  }
+  const delimiter = process.platform === "win32" ? ";" : ":";
+  for (const raw of (process.env.NODE_PATH ?? "").split(delimiter)) {
+    const np = raw.trim();
+    if (!np) continue;
+    const p = (0, import_node_path.join)(np, "openclaw", "package.json");
+    if ((0, import_node_fs.existsSync)(p)) return (0, import_node_path.dirname)(p);
+  }
+  let anchor;
+  let d = process.cwd();
+  for (let i = 0; i < 8; i++) {
+    const pkg = (0, import_node_path.join)(d, "package.json");
+    if ((0, import_node_fs.existsSync)(pkg)) {
+      anchor = pkg;
+      break;
+    }
+    const parent = (0, import_node_path.dirname)(d);
+    if (parent === d) break;
+    d = parent;
+  }
+  if (anchor) {
+    const req = (0, import_node_module.createRequire)(anchor);
+    for (const root of LEGACY_RESOLVE_ROOTS) {
+      try {
+        const mainEntry = req.resolve("openclaw", { paths: [root] });
+        return (0, import_node_path.join)((0, import_node_path.dirname)(mainEntry), "..");
+      } catch {
+      }
     }
   }
-  throw new Error(`${CSDN_LOG_TAG} could not resolve openclaw reply-runtime from disk`);
+  return void 0;
+}
+async function importPluginSdkFromRoot(root) {
+  const sdkEntry = (0, import_node_path.join)(root, "dist", "plugin-sdk", "index.js");
+  if (!(0, import_node_fs.existsSync)(sdkEntry)) {
+    throw new Error(`${CSDN_LOG_TAG} openclaw plugin-sdk not found at ${sdkEntry}`);
+  }
+  return await import((0, import_node_url.pathToFileURL)(sdkEntry).href);
+}
+async function importReplyRuntimeFromRoot(root) {
+  const entry = (0, import_node_path.join)(root, "dist", "plugin-sdk", "reply-runtime.js");
+  if (!(0, import_node_fs.existsSync)(entry)) {
+    throw new Error(`${CSDN_LOG_TAG} openclaw reply-runtime not found at ${entry}`);
+  }
+  return await import((0, import_node_url.pathToFileURL)(entry).href);
 }
 async function loadOpenclawReplyRuntime() {
-  try {
-    return await import("openclaw/plugin-sdk/reply-runtime");
-  } catch (first) {
+  const root = resolveOpenclawPackageRoot();
+  if (root) {
     try {
-      return await importOpenclawReplyRuntimeFromDisk();
+      return await importReplyRuntimeFromRoot(root);
     } catch {
-      throw first;
     }
   }
+  return await import("openclaw/plugin-sdk/reply-runtime");
 }
 async function loadOpenclawPluginSdk() {
-  try {
-    return await import("openclaw/plugin-sdk");
-  } catch (first) {
+  const root = resolveOpenclawPackageRoot();
+  if (root) {
     try {
-      return await importOpenclawPluginSdkFromDisk();
+      return await importPluginSdkFromRoot(root);
     } catch {
-      throw first;
     }
   }
+  return await import("openclaw/plugin-sdk");
 }
 
 // src/outbound.ts

package/dist/index.js

@@ -1,4 +1,10 @@
 var __defProp = Object.defineProperty;
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -4461,73 +4467,137 @@ import { existsSync } from "fs";
 import { createRequire } from "module";
 import { dirname, join } from "path";
 import { pathToFileURL } from "url";
-function findRequireAnchorPackageJson() {
-  let dir = process.cwd();
-  for (let i = 0; i < 8; i++) {
-    const pkg = join(dir, "package.json");
-    if (existsSync(pkg)) return pkg;
-    const parent = dirname(dir);
-    if (parent === dir) break;
-    dir = parent;
-  }
-  throw new Error(
-    `${CSDN_LOG_TAG} loadOpenclawPluginSdk: no package.json found walking up from process.cwd(); cannot createRequire for openclaw fallback`
-  );
-}
-var OPENCLAW_SEARCH_ROOTS = [
+var NODE_MODULES_OPENCLAW = join("node_modules", "openclaw", "package.json");
+var LEGACY_RESOLVE_ROOTS = [
   process.cwd(),
   join(process.cwd(), ".."),
   join(process.cwd(), "..", ".."),
   join(process.cwd(), "packages", "csdn"),
   join(process.cwd(), "..", "packages", "csdn")
 ];
-async function importOpenclawPluginSdkFromDisk() {
-  const require2 = createRequire(findRequireAnchorPackageJson());
-  for (const root of OPENCLAW_SEARCH_ROOTS) {
-    try {
-      const mainEntry = require2.resolve("openclaw", { paths: [root] });
-      const pkgRoot = join(dirname(mainEntry), "..");
-      const sdkEntry = join(pkgRoot, "dist", "plugin-sdk", "index.js");
-      return await import(pathToFileURL(sdkEntry).href);
-    } catch {
+function tryResolveOpenclawRootWithRequire(anchorFile) {
+  try {
+    const req = createRequire(anchorFile);
+    let d = dirname(req.resolve("openclaw"));
+    for (let i = 0; i < 8; i++) {
+      if (existsSync(join(d, "package.json")) && existsSync(join(d, "dist", "plugin-sdk", "index.js"))) {
+        return d;
+      }
+      const parent = dirname(d);
+      if (parent === d) break;
+      d = parent;
     }
+  } catch {
+    return void 0;
   }
-  throw new Error(`${CSDN_LOG_TAG} could not resolve openclaw from disk`);
+  return void 0;
 }
-async function importOpenclawReplyRuntimeFromDisk() {
-  const require2 = createRequire(findRequireAnchorPackageJson());
-  for (const root of OPENCLAW_SEARCH_ROOTS) {
-    try {
-      const mainEntry = require2.resolve("openclaw", { paths: [root] });
-      const pkgRoot = join(dirname(mainEntry), "..");
-      const entry = join(pkgRoot, "dist", "plugin-sdk", "reply-runtime.js");
-      return await import(pathToFileURL(entry).href);
-    } catch {
+function scanUpFromEntryMain(main) {
+  const fromEntry = tryResolveOpenclawRootWithRequire(main);
+  if (fromEntry) return fromEntry;
+  let dir = dirname(main);
+  for (let i = 0; i < 48; i++) {
+    const pkgJson = join(dir, "package.json");
+    if (existsSync(pkgJson)) {
+      const hit = tryResolveOpenclawRootWithRequire(pkgJson);
+      if (hit) return hit;
+    }
+    const direct = join(dir, NODE_MODULES_OPENCLAW);
+    if (existsSync(direct)) return dirname(direct);
+    const parent = dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return void 0;
+}
+function listEntryAnchorScripts() {
+  const out = [];
+  const a = process.argv[1];
+  if (a && existsSync(a)) out.push(a);
+  try {
+    const mainFn = typeof __require !== "undefined" ? __require.main?.filename : void 0;
+    if (mainFn && existsSync(mainFn) && mainFn !== a) out.push(mainFn);
+  } catch {
+  }
+  return out;
+}
+function resolveOpenclawPackageRoot() {
+  for (const main of listEntryAnchorScripts()) {
+    const hit = scanUpFromEntryMain(main);
+    if (hit) return hit;
+  }
+  let cwd = process.cwd();
+  for (let i = 0; i < 48; i++) {
+    const direct = join(cwd, NODE_MODULES_OPENCLAW);
+    if (existsSync(direct)) return dirname(direct);
+    const parent = dirname(cwd);
+    if (parent === cwd) break;
+    cwd = parent;
+  }
+  const delimiter = process.platform === "win32" ? ";" : ":";
+  for (const raw of (process.env.NODE_PATH ?? "").split(delimiter)) {
+    const np = raw.trim();
+    if (!np) continue;
+    const p = join(np, "openclaw", "package.json");
+    if (existsSync(p)) return dirname(p);
+  }
+  let anchor;
+  let d = process.cwd();
+  for (let i = 0; i < 8; i++) {
+    const pkg = join(d, "package.json");
+    if (existsSync(pkg)) {
+      anchor = pkg;
+      break;
     }
+    const parent = dirname(d);
+    if (parent === d) break;
+    d = parent;
   }
-  throw new Error(`${CSDN_LOG_TAG} could not resolve openclaw reply-runtime from disk`);
+  if (anchor) {
+    const req = createRequire(anchor);
+    for (const root of LEGACY_RESOLVE_ROOTS) {
+      try {
+        const mainEntry = req.resolve("openclaw", { paths: [root] });
+        return join(dirname(mainEntry), "..");
+      } catch {
+      }
+    }
+  }
+  return void 0;
+}
+async function importPluginSdkFromRoot(root) {
+  const sdkEntry = join(root, "dist", "plugin-sdk", "index.js");
+  if (!existsSync(sdkEntry)) {
+    throw new Error(`${CSDN_LOG_TAG} openclaw plugin-sdk not found at ${sdkEntry}`);
+  }
+  return await import(pathToFileURL(sdkEntry).href);
+}
+async function importReplyRuntimeFromRoot(root) {
+  const entry = join(root, "dist", "plugin-sdk", "reply-runtime.js");
+  if (!existsSync(entry)) {
+    throw new Error(`${CSDN_LOG_TAG} openclaw reply-runtime not found at ${entry}`);
+  }
+  return await import(pathToFileURL(entry).href);
 }
 async function loadOpenclawReplyRuntime() {
-  try {
-    return await import("openclaw/plugin-sdk/reply-runtime");
-  } catch (first) {
+  const root = resolveOpenclawPackageRoot();
+  if (root) {
     try {
-      return await importOpenclawReplyRuntimeFromDisk();
+      return await importReplyRuntimeFromRoot(root);
     } catch {
-      throw first;
     }
   }
+  return await import("openclaw/plugin-sdk/reply-runtime");
 }
 async function loadOpenclawPluginSdk() {
-  try {
-    return await import("openclaw/plugin-sdk");
-  } catch (first) {
+  const root = resolveOpenclawPackageRoot();
+  if (root) {
     try {
-      return await importOpenclawPluginSdkFromDisk();
+      return await importPluginSdkFromRoot(root);
     } catch {
-      throw first;
     }
   }
+  return await import("openclaw/plugin-sdk");
 }
 
 // src/outbound.ts

package/openclaw.plugin.json

@@ -10,7 +10,7 @@
       },
       "apiUrl": {
         "type": "string",
-        "default": "https://test-msg.csdn.net/claw",
+        "default": "https://msg.csdn.net/claw",
         "description": "notification-claw 服务根 URL（不含路径），见 docs/ClawBot接口定义.md"
       },
       "token": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "csdn-im",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "type": "module",
   "description": "OpenClaw channel plugin for CSDN IM",
   "license": "MIT",