openclawmp 0.1.2 → 0.1.3

package/lib/api.js

@@ -1,6 +1,7 @@
 // ============================================================================
 // api.js — HTTP request helpers for the OpenClaw Marketplace API
 //
+// Uses V1 API endpoints for lightweight responses (AssetCompact).
 // Uses Node.js built-in fetch (available since Node 18)
 // ============================================================================
 
@@ -22,7 +23,7 @@ function authHeaders() {
 
 /**
  * Make a GET request to the API
- * @param {string} apiPath - API path (e.g., '/api/assets')
+ * @param {string} apiPath - API path (e.g., '/api/v1/assets')
  * @param {object} [params] - Query parameters
  * @returns {Promise<object>} Parsed JSON response
  */
@@ -107,40 +108,53 @@ async function download(apiPath) {
 }
 
 /**
- * Search assets
+ * Search assets via V1 API (returns lightweight AssetCompact items).
+ *
+ * V1 response shape: { query, total, items: AssetCompact[], nextCursor }
+ * AssetCompact fields: id, name, displayName, type, description, tags,
+ *   installs, rating, author (string), authorId, version, installCommand,
+ *   updatedAt, category
+ *
  * @param {string} query
  * @param {object} [opts] - { type, limit }
- * @returns {Promise<object>}
+ * @returns {Promise<object>} V1 search response
  */
 async function searchAssets(query, opts = {}) {
   const params = { q: query, limit: opts.limit || 20 };
   if (opts.type) params.type = opts.type;
-  return get('/api/assets', params);
+  return get('/api/v1/search', params);
 }
 
 /**
- * Find an asset by type and slug (with optional author filter)
+ * Find an asset by type and slug (with optional author filter).
+ * Uses V1 list endpoint for lightweight data.
+ *
  * @param {string} type
  * @param {string} slug
- * @param {string} [authorFilter]
+ * @param {string} [authorFilter] - author ID or author name to filter by
  * @returns {Promise<object|null>}
  */
 async function findAsset(type, slug, authorFilter) {
-  const result = await get('/api/assets', { q: slug, limit: 50 });
-  const assets = result?.data?.assets || [];
+  const result = await get('/api/v1/assets', { q: slug, type, limit: 50 });
+  const assets = result?.items || [];
 
-  // Exact match on type + name
-  let matches = assets.filter(a => a.type === type && a.name === slug);
+  // Exact match on name
+  let matches = assets.filter(a => a.name === slug);
   if (authorFilter) {
-    const authorMatches = matches.filter(a => (a.author?.id || '') === authorFilter);
+    // authorFilter could be an authorId or author name
+    const authorMatches = matches.filter(a =>
+      a.authorId === authorFilter || a.author === authorFilter
+    );
     if (authorMatches.length > 0) matches = authorMatches;
   }
 
-  // Fallback: partial match
+  // Fallback: partial match on name
   if (matches.length === 0) {
-    matches = assets.filter(a => a.type === type && a.name.includes(slug));
+    matches = assets.filter(a => a.name.includes(slug));
     if (authorFilter) {
-      const authorMatches = matches.filter(a => (a.author?.id || '') === authorFilter);
+      const authorMatches = matches.filter(a =>
+        a.authorId === authorFilter || a.author === authorFilter
+      );
       if (authorMatches.length > 0) matches = authorMatches;
     }
   }
@@ -148,10 +162,26 @@ async function findAsset(type, slug, authorFilter) {
   if (matches.length === 0) return null;
 
   // Prefer the one with an author ID
-  matches.sort((a, b) => (b.author?.id || '').localeCompare(a.author?.id || ''));
+  matches.sort((a, b) => (b.authorId || '').localeCompare(a.authorId || ''));
   return matches[0];
 }
 
+/**
+ * Get asset detail (L2) by ID via V1 API.
+ * Returns full detail including readme, files, versions.
+ *
+ * @param {string} id - Asset ID
+ * @returns {Promise<object|null>}
+ */
+async function getAssetById(id) {
+  try {
+    return await get(`/api/v1/assets/${id}`);
+  } catch (e) {
+    if (e.message.includes('404')) return null;
+    throw e;
+  }
+}
+
 /**
  * Make a DELETE request to the API
  * @param {string} apiPath
@@ -178,18 +208,21 @@ async function del(apiPath, body) {
 /**
  * Resolve an asset reference to a full asset object.
  * Accepts:
- *   - Direct ID: "tr-fc617094de29f938"
+ *   - Direct ID: "s-abc123", "tr-fc617094de29f938"
  *   - type/@author/slug: "trigger/@xiaoyue/pdf-watcher"
+ *
+ * Uses V1 API: GET /api/v1/assets/:id for ID lookups,
+ * findAsset() (V1 search) for type/slug lookups.
+ *
  * @param {string} ref
  * @returns {Promise<object>} asset object with at least { id, name, ... }
  */
 async function resolveAssetRef(ref) {
-  // Direct ID pattern: known prefix + dash + hex (sk-/pl-/tr-/ch-/ex-)
-  if (/^(sk|pl|tr|ch|ex)-[0-9a-f]+$/.test(ref)) {
-    // Fetch by ID directly
-    const result = await get(`/api/assets/${ref}`);
-    // API may return { data: { asset } } or the asset directly
-    return result?.data?.asset || result?.data || result;
+  // Direct ID pattern: prefix + dash + hex
+  if (/^[a-z]+-[0-9a-f]{8,}$/.test(ref)) {
+    const result = await getAssetById(ref);
+    if (!result) throw new Error(`Asset not found: ${ref}`);
+    return result;
   }
 
   // type/@author/slug format
@@ -223,5 +256,6 @@ module.exports = {
   download,
   searchAssets,
   findAsset,
+  getAssetById,
   resolveAssetRef,
 };

package/lib/commands/info.js

@@ -27,8 +27,9 @@ async function run(args) {
     process.exit(1);
   }
 
-  const authorName = asset.author?.name || 'unknown';
-  const authorId = asset.author?.id || '';
+  // V1 AssetCompact: author is a string, authorId is separate
+  const authorName = asset.author || 'unknown';
+  const authorId = asset.authorId || '';
   const tags = (asset.tags || []).join(', ');
 
   console.log('');
@@ -38,8 +39,7 @@ async function run(args) {
   console.log(`  Package:   ${asset.name}`);
   console.log(`  Version:   ${asset.version}`);
   console.log(`  Author:    ${c('cyan', authorName)} ${c('dim', `(${authorId})`)}`);
-  console.log(`  Score:     ${asset.hubScore || 0}`);
-  console.log(`  Downloads: ${asset.downloads || 0}`);
+  console.log(`  Installs:  ${asset.installs || 0}`);
   if (tags) {
     console.log(`  Tags:      ${tags}`);
   }

package/lib/commands/install.js

@@ -106,7 +106,8 @@ function writeManifest(asset, targetDir, hasPackage) {
     name: asset.name,
     displayName: asset.displayName || '',
     version: asset.version,
-    author: asset.author,
+    author: asset.author || '',
+    authorId: asset.authorId || '',
     description: asset.description || '',
     tags: asset.tags || [],
     category: asset.category || '',
@@ -167,8 +168,8 @@ async function run(args, flags) {
 
   const displayName = asset.displayName || asset.name;
   const version = asset.version;
-  const authorName = asset.author?.name || 'unknown';
-  const authorId = asset.author?.id || '';
+  const authorName = asset.author || 'unknown';
+  const authorId = asset.authorId || '';
 
   console.log(`  ${c('bold', displayName)} ${c('dim', `v${version}`)}`);
   console.log(`  by ${c('cyan', authorName)} ${c('dim', `(${authorId})`)}`);
@@ -203,7 +204,7 @@ async function run(args, flags) {
 
   // Try downloading the actual package
   let hasPackage = false;
-  const pkgBuffer = await api.download(`/api/assets/${asset.id}/download`);
+  const pkgBuffer = await api.download(`/api/v1/assets/${asset.id}/download`);
 
   if (pkgBuffer && pkgBuffer.length > 0) {
     info('📦 Downloading package from registry...');

package/lib/commands/search.js

@@ -18,8 +18,8 @@ async function run(args) {
   console.log('');
 
   const result = await api.searchAssets(query);
-  const assets = result?.data?.assets || [];
-  const total = result?.data?.total || 0;
+  const assets = result?.items || [];
+  const total = result?.total || 0;
 
   if (assets.length === 0) {
     console.log('  No results found.');
@@ -31,12 +31,12 @@ async function run(args) {
 
   for (const a of assets) {
     const icon = typeIcon(a.type);
-    const score = a.hubScore || 0;
-    const author = a.author?.name || 'unknown';
-    const authorId = a.author?.id || 'unknown';
+    const installs = a.installs || 0;
+    const author = a.author || 'unknown';
+    const authorId = a.authorId || 'unknown';
 
     console.log(`  ${icon} ${c('bold', a.displayName)}`);
-    console.log(`     ${a.type}/@${authorId}/${a.name}  •  v${a.version}  •  by ${c('cyan', author)}  •  Score: ${score}`);
+    console.log(`     ${a.type}/@${authorId}/${a.name}  •  v${a.version}  •  by ${c('cyan', author)}  •  Installs: ${installs}`);
 
     const desc = (a.description || '').slice(0, 80);
     if (desc) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclawmp",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "\ud83d\udc1f OpenClaw Marketplace CLI \u2014 \u6c34\u4ea7\u5e02\u573a\u547d\u4ee4\u884c\u5de5\u5177",
   "bin": {
     "openclawmp": "./bin/openclawmp.js"