@clwnt/clawnet 0.7.16 → 0.7.18

package/index.ts

@@ -1,7 +1,7 @@
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk/core";
 import { registerClawnetCli, buildClawnetMapping, upsertMapping, buildStatusText } from "./src/cli.js";
 import { createClawnetService, getHooksUrl, getHooksToken } from "./src/service.js";
-import { parseConfig } from "./src/config.js";
+import { parseConfig, resolveToken } from "./src/config.js";
 import { registerTools, loadToolDescriptions } from "./src/tools.js";
 import { migrateConfig, CURRENT_SETUP_VERSION } from "./src/migrate.js";
 
@@ -56,9 +56,7 @@ const plugin = {
           if (enabledAccounts.length > 0) {
             const issues: string[] = [];
             for (const account of enabledAccounts) {
-              const tokenRef = account.token ?? "";
-              const envMatch = tokenRef.match(/^\$\{(.+)\}$/);
-              const token = envMatch ? process.env[envMatch[1]] || "" : tokenRef;
+              const token = resolveToken(typeof account.token === "string" ? account.token : "");
               if (!token) {
                 issues.push(`${account.agentId}: no token resolved`);
                 continue;

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "clawnet",
   "name": "ClawNet",
   "description": "ClawNet integration — poll inbox, route messages to hooks",
-  "version": "0.7.16",
+  "version": "0.7.18",
   "skills": ["skills"],
   "configSchema": {
     "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clwnt/clawnet",
-  "version": "0.7.16",
+  "version": "0.7.18",
   "type": "module",
   "description": "ClawNet integration for OpenClaw — poll inbox, route messages to hooks",
   "files": [

package/src/cli.ts

@@ -5,6 +5,7 @@ import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import * as os from "node:os";
 import type { ClawnetConfig } from "./config.js";
+import { resolveToken } from "./config.js";
 import { PLUGIN_VERSION } from "./service.js";
 
 const API_BASE = "https://api.clwnt.com";
@@ -660,9 +661,7 @@ export function registerClawnetCli(params: { program: Command; api: any; cfg: Cl
         console.log("\n  Connectivity:\n");
         const routingIssues: string[] = [];
         for (const account of pluginCfg.accounts) {
-          const tokenRef = account.token;
-          const match = tokenRef.match(/^\$\{(.+)\}$/);
-          const resolvedToken = match ? process.env[match[1]] || "" : tokenRef;
+          const resolvedToken = resolveToken(typeof account.token === "string" ? account.token : "");
 
           if (!resolvedToken) {
             console.log(`    ${account.id}: NO TOKEN (env var not set)`);

package/src/config.ts

@@ -102,3 +102,7 @@ export function resolveToken(token: string): string {
   }
   return token.trim();
 }
+
+export function resolveHooksToken(token: string): string {
+  return resolveToken(token) || process.env.OPENCLAW_HOOKS_TOKEN?.trim() || "";
+}

package/src/service.ts

@@ -1,5 +1,8 @@
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { dirname, join } from "node:path";
 import type { ClawnetConfig, ClawnetAccount } from "./config.js";
-import { parseConfig, resolveToken } from "./config.js";
+import { parseConfig, resolveHooksToken, resolveToken } from "./config.js";
 import { reloadCapabilities } from "./tools.js";
 import { reloadHookTemplate, getHookTemplate } from "./cli.js";
 
@@ -38,7 +41,7 @@ export function getHooksUrl(api: any): string {
 
 export function getHooksToken(api: any): string {
   const rawToken = api.config?.hooks?.token ?? "";
-  return resolveToken(rawToken) || process.env.OPENCLAW_HOOKS_TOKEN || "";
+  return resolveHooksToken(rawToken);
 }
 
 // --- Onboarding message (cached from server) ---
@@ -73,7 +76,9 @@ async function reloadOnboardingMessage(): Promise<void> {
 
 const SKILL_UPDATE_INTERVAL_MS = 6 * 60 * 60 * 1000; // 6 hours
 const SKILL_FILES = ["skill.json", "api-reference.md", "inbox-handler.md", "capabilities.json", "hook-template.txt", "tool-descriptions.json", "onboarding-message.txt", "inbox-protocol.md"];
-export const PLUGIN_VERSION = "0.7.13"; // Reported to server via PATCH /me every 6h
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const manifest = JSON.parse(readFileSync(join(__dirname, "..", "openclaw.plugin.json"), "utf-8"));
+export const PLUGIN_VERSION: string = manifest.version ?? "unknown";
 
 function loadFreshConfig(api: any): ClawnetConfig {
   const raw = api.runtime?.config?.loadConfig?.()?.plugins?.entries?.clawnet?.config ?? {};