@syfei49/mini-dynamic-renderer 1.0.7 → 1.2.0

package/index.js

@@ -1,16 +1,16 @@
-var initModule = require('./src/init');
-var interceptor = require('./src/interceptor');
-var handler = require('./src/handler');
-var chatService = require('./src/chat/service');
-var configModule = require('./src/config');
-
-module.exports = {
-  version: '1.0.7',
-  init: initModule.init,
-  getConfig: configModule.getConfig,
-  isInitialized: initModule.isInitialized,
-  uninstall: interceptor.uninstallInterceptor,
-  parseRenderConfig: handler.parseRenderConfig,
-  openChat: chatService.openConversation,
-  closeChat: chatService.closeConversation
-};
+var initModule = require('./src/init');
+var interceptor = require('./src/interceptor');
+var handler = require('./src/handler');
+var chatService = require('./src/chat/service');
+var configModule = require('./src/config');
+
+module.exports = {
+  version: '1.1.1',
+  init: initModule.init,
+  getConfig: configModule.getConfig,
+  isInitialized: initModule.isInitialized,
+  uninstall: interceptor.uninstallInterceptor,
+  parseRenderConfig: handler.parseRenderConfig,
+  openChat: chatService.openConversation,
+  closeChat: chatService.closeConversation
+};

package/package.json

@@ -1,27 +1,27 @@
-{
-  "name": "@syfei49/mini-dynamic-renderer",
-  "version": "1.0.7",
-  "description": "uni-app 浮层 AI 客服插件",
-  "main": "index.js",
-  "files": [
-    "index.js",
-    "src/**/*.js",
-    "components/**/*.vue",
-    "README.md"
-  ],
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [
-    "uni-app",
-    "mini-program",
-    "ai",
-    "chat",
-    "float"
-  ],
-  "author": "syfei49",
-  "license": "MIT",
-  "publishConfig": {
-    "access": "public"
-  }
-}
+{
+  "name": "@syfei49/mini-dynamic-renderer",
+  "version": "1.2.0",
+  "description": "uni-app 浮层 AI 客服插件",
+  "main": "index.js",
+  "files": [
+    "index.js",
+    "src/**/*.js",
+    "components/**/*.vue",
+    "README.md"
+  ],
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [
+    "uni-app",
+    "mini-program",
+    "ai",
+    "chat",
+    "float"
+  ],
+  "author": "syfei49",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  }
+}

package/src/adapters/request.js

@@ -1,106 +1,148 @@
-var configModule = require('../config');
-
-function getFullUrl(path) {
-  var config = configModule.getConfig();
-  var baseUrl = config.baseUrl || '';
-  var normalizedPath = (path || '').replace(/^\/+/, '/');
-  if (baseUrl.slice(-1) === '/' && normalizedPath.indexOf('/') === 0) {
-    return baseUrl + normalizedPath.slice(1);
-  }
-  if (baseUrl && normalizedPath.indexOf('/') !== 0) {
-    normalizedPath = '/' + normalizedPath;
-  }
-  return baseUrl + normalizedPath;
-}
-
-function getHeaders(extraHeaders) {
-  var config = configModule.getConfig();
-  var headers = Object.assign({}, config.getHeaders() || {});
-  var token = typeof config.getToken === 'function' ? config.getToken() : '';
-  if (token) {
-    headers.Authorization = token;
-  }
-  if (extraHeaders) {
-    Object.assign(headers, extraHeaders);
-  }
-  return headers;
-}
-
-function sendChat(payload) {
-  var config = configModule.getConfig();
-  var url = getFullUrl(config.chatApiPath);
-  var headers = getHeaders({
-    'Content-Type': 'application/json'
-  });
-
-  if (config.debug) {
-    console.log('[mini-dynamic-renderer] sendChat', url, payload);
-  }
-
-  return new Promise(function (resolve, reject) {
-    uni.request({
-      url: url,
-      method: 'POST',
-      data: payload,
-      header: headers,
-      timeout: 120000,
-      success: function (res) {
-        var data = res.data || {};
-        if (res.statusCode >= 200 && res.statusCode < 300 && data.code !== 500) {
-          resolve(data);
-        } else {
-          reject(new Error(data.msg || data.message || ('请求失败 ' + res.statusCode)));
-        }
-      },
-      fail: function (err) {
-        reject(err || new Error('网络请求失败'));
-      }
-    });
-  });
-}
-
-function uploadImage(filePath) {
-  var config = configModule.getConfig();
-  var url = getFullUrl(config.uploadApiPath);
-  var headers = getHeaders();
-
-  if (config.debug) {
-    console.log('[mini-dynamic-renderer] uploadImage', url, filePath);
-  }
-
-  return new Promise(function (resolve, reject) {
-    uni.uploadFile({
-      url: url,
-      filePath: filePath,
-      name: 'file',
-      header: headers,
-      success: function (res) {
-        var data = res.data || '{}';
-        try {
-          data = typeof data === 'string' ? JSON.parse(data) : data;
-        } catch (e) {
-          reject(new Error('上传响应解析失败'));
-          return;
-        }
-        var dataObj = data.data || {};
-        var urlValue = data.url || dataObj.url || dataObj.fileName || dataObj || '';
-        if (urlValue && typeof urlValue === 'object' && urlValue.url) {
-          urlValue = urlValue.url;
-        }
-        if (urlValue) {
-          resolve(urlValue);
-        } else {
-          reject(new Error(data.msg || data.message || '上传失败'));
-        }
-      },
-      fail: function (err) {
-        reject(err || new Error('图片上传失败'));
-      }
-    });
-  });
-}
-
-module.exports = {
-  sendChat: sendChat,
-  uploadImage: uploadImage
-};
+var configModule = require('../config');
+
+function getFullUrl(path, useUploadBase) {
+  var config = configModule.getConfig();
+  var baseUrl = (useUploadBase && config.uploadBaseUrl) ? config.uploadBaseUrl : config.baseUrl;
+  baseUrl = baseUrl || '';
+  var normalizedPath = (path || '').replace(/^\/+/, '/');
+  if (baseUrl.slice(-1) === '/' && normalizedPath.indexOf('/') === 0) {
+    return baseUrl + normalizedPath.slice(1);
+  }
+  if (baseUrl && normalizedPath.indexOf('/') !== 0) {
+    normalizedPath = '/' + normalizedPath;
+  }
+  return baseUrl + normalizedPath;
+}
+
+function getHeaders(extraHeaders) {
+  var config = configModule.getConfig();
+  var headers = Object.assign({}, config.getHeaders() || {});
+  var token = typeof config.getToken === 'function' ? config.getToken() : '';
+  if (token) {
+    headers.Authorization = token;
+  }
+  if (config.appId) {
+    headers['X-App-Id'] = config.appId;
+  }
+  if (extraHeaders) {
+    Object.assign(headers, extraHeaders);
+  }
+  return headers;
+}
+
+function sendChat(payload) {
+  var config = configModule.getConfig();
+  var url = getFullUrl(config.chatApiPath);
+  var headers = getHeaders({
+    'Content-Type': 'application/json'
+  });
+  var data = Object.assign({}, payload || {});
+  if (!data.inputs) {
+    delete data.inputs;
+  }
+
+  if (config.debug) {
+    console.log('[mini-dynamic-renderer] sendChat', url, data);
+  }
+
+  return new Promise(function (resolve, reject) {
+    uni.request({
+      url: url,
+      method: 'POST',
+      data: data,
+      header: headers,
+      timeout: 120000,
+      success: function (res) {
+        var data = res.data || {};
+        if (res.statusCode >= 200 && res.statusCode < 300 && data.code !== 500) {
+          resolve(data);
+        } else {
+          reject(new Error(data.msg || data.message || ('请求失败 ' + res.statusCode)));
+        }
+      },
+      fail: function (err) {
+        reject(err || new Error('网络请求失败'));
+      }
+    });
+  });
+}
+
+function uploadImage(filePath) {
+  var config = configModule.getConfig();
+  var url = getFullUrl(config.uploadApiPath, true);
+  var headers = getHeaders();
+
+  if (config.debug) {
+    console.log('[mini-dynamic-renderer] uploadImage', url, filePath);
+  }
+
+  return new Promise(function (resolve, reject) {
+    uni.uploadFile({
+      url: url,
+      filePath: filePath,
+      name: 'file',
+      header: headers,
+      success: function (res) {
+        var data = res.data || '{}';
+        try {
+          data = typeof data === 'string' ? JSON.parse(data) : data;
+        } catch (e) {
+          reject(new Error('上传响应解析失败'));
+          return;
+        }
+        var dataObj = data.data || {};
+        var urlValue = data.url || dataObj.url || dataObj.fileName || dataObj || '';
+        if (urlValue && typeof urlValue === 'object' && urlValue.url) {
+          urlValue = urlValue.url;
+        }
+        if (urlValue) {
+          resolve(urlValue);
+        } else {
+          reject(new Error(data.msg || data.message || '上传失败'));
+        }
+      },
+      fail: function (err) {
+        reject(err || new Error('图片上传失败'));
+      }
+    });
+  });
+}
+
+function sendAction(payload) {
+  var config = configModule.getConfig();
+  var url = getFullUrl(config.actionApiPath || '/openapi/mini/ai/action');
+  var headers = getHeaders({
+    'Content-Type': 'application/json'
+  });
+
+  if (config.debug) {
+    console.log('[mini-dynamic-renderer] sendAction', url, payload);
+  }
+
+  return new Promise(function (resolve, reject) {
+    uni.request({
+      url: url,
+      method: 'POST',
+      data: payload || {},
+      header: headers,
+      timeout: 120000,
+      success: function (res) {
+        var data = res.data || {};
+        if (res.statusCode >= 200 && res.statusCode < 300 && data.code !== 500) {
+          resolve(data);
+        } else {
+          reject(new Error(data.msg || data.message || ('请求失败 ' + res.statusCode)));
+        }
+      },
+      fail: function (err) {
+        reject(err || new Error('网络请求失败'));
+      }
+    });
+  });
+}
+
+module.exports = {
+  sendChat: sendChat,
+  uploadImage: uploadImage,
+  sendAction: sendAction
+};

package/src/chat/parser.js

@@ -1,55 +1,152 @@
-function cleanImageUrl(url) {
-  return String(url || '').replace(/[)\]}>.,;，。]+$/g, '');
-}
-
-function parseAssistantMessage(answer) {
-  if (!answer) {
-    return {
-      content: '',
-      imageUrls: []
-    };
-  }
-  var imageUrls = [];
-  var iconLineRegex = /[-－•]\s*图标[：:]\s*(https?:\/\/\S+)/gi;
-  var match;
-  while ((match = iconLineRegex.exec(answer)) !== null) {
-    var url = cleanImageUrl(match[1]);
-    if (url && imageUrls.indexOf(url) === -1) {
-      imageUrls.push(url);
-    }
-  }
-  var content = answer;
-  if (imageUrls.length) {
-    content = answer.replace(/[-－•]\s*图标[：:]\s*https?:\/\/\S+/gi, '- 图标：');
-  }
-  return {
-    content: content.trim(),
-    imageUrls: imageUrls
-  };
-}
-
-function parseNeedIcon(answer) {
-  if (!answer || answer.indexOf('[NEED_ICON]') === -1) {
-    return null;
-  }
-  var jsonPart = answer.replace('[NEED_ICON]', '').trim();
-  try {
-    var data = JSON.parse(jsonPart);
-    if (!data || !data.name) {
-      return null;
-    }
-    return {
-      name: data.name,
-      sort: Number(data.sort != null ? data.sort : 0),
-      msg: data.msg || ('请上传一张图片作为「' + data.name + '」的分类图标')
-    };
-  } catch (error) {
-    return null;
-  }
-}
-
-module.exports = {
-  cleanImageUrl: cleanImageUrl,
-  parseAssistantMessage: parseAssistantMessage,
-  parseNeedIcon: parseNeedIcon
-};
+function cleanImageUrl(url) {
+  return String(url || '').replace(/[)\]}>.,;，。]+$/g, '');
+}
+
+function parseAssistantMessage(answer) {
+  if (!answer) {
+    return {
+      content: '',
+      imageUrls: []
+    };
+  }
+  var imageUrls = [];
+  var iconLineRegex = /[-－•]\s*图标[：:]\s*(https?:\/\/\S+)/gi;
+  var match;
+  while ((match = iconLineRegex.exec(answer)) !== null) {
+    var url = cleanImageUrl(match[1]);
+    if (url && imageUrls.indexOf(url) === -1) {
+      imageUrls.push(url);
+    }
+  }
+  var content = answer;
+  if (imageUrls.length) {
+    content = answer.replace(/[-－•]\s*图标[：:]\s*https?:\/\/\S+/gi, '- 图标：');
+  }
+  return {
+    content: content.trim(),
+    imageUrls: imageUrls
+  };
+}
+
+function parseNeedIcon(answer) {
+  if (!answer || answer.indexOf('[NEED_ICON]') === -1) {
+    return null;
+  }
+  var jsonPart = answer.replace('[NEED_ICON]', '').trim();
+  try {
+    var data = JSON.parse(jsonPart);
+    if (!data || !data.name) {
+      return null;
+    }
+    return {
+      name: data.name,
+      sort: Number(data.sort != null ? data.sort : 0),
+      msg: data.msg || ('请上传一张图片作为「' + data.name + '」的分类图标')
+    };
+  } catch (error) {
+    return null;
+  }
+}
+
+function parseRenderConfig(answer) {
+  if (!answer || typeof answer !== 'string') {
+    return null;
+  }
+  var renderIdx = answer.indexOf('[RENDER_CONFIG]');
+  if (renderIdx !== -1) {
+    var jsonPart = answer.substring(renderIdx + '[RENDER_CONFIG]'.length);
+    var start = jsonPart.indexOf('{');
+    var end = jsonPart.lastIndexOf('}');
+    if (start === -1 || end === -1 || end < start) {
+      return null;
+    }
+    try {
+      return JSON.parse(jsonPart.substring(start, end + 1));
+    } catch (e) {
+      return null;
+    }
+  }
+  if (answer.indexOf('[NEED_ICON]') !== -1) {
+    return {
+      type: 'iconPicker',
+      fields: [{ name: 'imageUrl', label: '分类图标', type: 'image' }]
+    };
+  }
+  return null;
+}
+
+function parseApiRenderConfig(renderConfig) {
+  if (!renderConfig) {
+    return null;
+  }
+  if (typeof renderConfig === 'object') {
+    return renderConfig;
+  }
+  if (typeof renderConfig === 'string') {
+    try {
+      return JSON.parse(renderConfig);
+    } catch (e) {
+      return null;
+    }
+  }
+  return null;
+}
+
+function extractJsonAfterMarker(answer, marker) {
+  if (!answer || typeof answer !== 'string') {
+    return null;
+  }
+  var idx = answer.indexOf(marker);
+  if (idx === -1) {
+    return null;
+  }
+  var jsonPart = answer.substring(idx + marker.length);
+  var start = jsonPart.indexOf('{');
+  if (start === -1) {
+    return null;
+  }
+  var depth = 0;
+  for (var i = start; i < jsonPart.length; i++) {
+    var ch = jsonPart.charAt(i);
+    if (ch === '{') {
+      depth++;
+    } else if (ch === '}') {
+      depth--;
+      if (depth === 0) {
+        return {
+          json: jsonPart.substring(start, i + 1),
+          end: idx + marker.length + i + 1
+        };
+      }
+    }
+  }
+  return null;
+}
+
+function stripMarkerBlock(answer, marker) {
+  var extracted = extractJsonAfterMarker(answer, marker);
+  if (!extracted) {
+    return answer;
+  }
+  return (answer.substring(0, answer.indexOf(marker)) + answer.substring(extracted.end)).trim();
+}
+
+function stripMarkers(answer) {
+  if (!answer || typeof answer !== 'string') {
+    return '';
+  }
+  var result = answer;
+  result = stripMarkerBlock(result, '[RENDER_CONFIG]');
+  result = stripMarkerBlock(result, '[AI_ACTION]');
+  result = stripMarkerBlock(result, '[NEED_ICON]');
+  return result.trim();
+}
+
+module.exports = {
+  cleanImageUrl: cleanImageUrl,
+  parseAssistantMessage: parseAssistantMessage,
+  parseNeedIcon: parseNeedIcon,
+  parseRenderConfig: parseRenderConfig,
+  parseApiRenderConfig: parseApiRenderConfig,
+  stripMarkers: stripMarkers
+};