@xuda.io/xuda-worker-bundle 1.3.2714 → 1.4.7

package/index.js

@@ -484,6 +484,13 @@ func.runtime.platform.apply_element_attributes = function (node, attributes, exc
   return node;
 };
 func.runtime.platform.load_script = function (url, type, callback, attributes) {
+  const normalized_url = typeof url === 'string' ? url.trim() : '';
+  if (!normalized_url || normalized_url === 'undefined' || normalized_url === 'null') {
+    if (callback) {
+      callback();
+    }
+    return null;
+  }
   const doc = func.runtime.platform.get_document();
   if (!doc?.createElement || !doc?.head?.appendChild) {
     if (callback) {
@@ -498,7 +505,7 @@ func.runtime.platform.load_script = function (url, type, callback, attributes) {
       if (asset_key && script.getAttribute('data-xuda-asset-key') === asset_key) {
         return true;
       }
-      return !!(url && script.getAttribute('src') === url);
+      return script.getAttribute('src') === normalized_url;
     }) || null;
   };
 
@@ -516,7 +523,7 @@ func.runtime.platform.load_script = function (url, type, callback, attributes) {
   }
 
   const script = doc.createElement('script');
-  script.src = url;
+  script.src = normalized_url;
   if (type) script.type = type;
   func.runtime.platform.apply_element_attributes(script, attributes, ['src', 'type']);
   script.onload = function () {
@@ -534,6 +541,10 @@ func.runtime.platform.load_script = function (url, type, callback, attributes) {
   return script;
 };
 func.runtime.platform.load_css = function (href, attributes) {
+  const normalized_href = typeof href === 'string' ? href.trim() : '';
+  if (!normalized_href || normalized_href === 'undefined' || normalized_href === 'null') {
+    return null;
+  }
   const doc = func.runtime.platform.get_document();
   if (!doc?.createElement || !doc?.head) {
     return;
@@ -545,7 +556,7 @@ func.runtime.platform.load_css = function (href, attributes) {
       if (asset_key && link.getAttribute('data-xuda-asset-key') === asset_key) {
         return true;
       }
-      return !!(href && link.getAttribute('href') === href);
+      return link.getAttribute('href') === normalized_href;
     });
     if (existing) return existing;
   } catch (err) {
@@ -554,7 +565,7 @@ func.runtime.platform.load_css = function (href, attributes) {
   const link = doc.createElement('link');
   link.rel = 'stylesheet';
   link.type = 'text/css';
-  link.href = href;
+  link.href = normalized_href;
   func.runtime.platform.apply_element_attributes(link, attributes, ['href']);
   doc.head.insertBefore(link, doc.head.firstChild);
   return link;
@@ -2389,7 +2400,16 @@ func.common.getContrast_color = function (hexcolor) {
 };
 
 func.common.get_url = function (SESSION_ID, method, path) {
-  return `https://${SESSION_OBJ[SESSION_ID].domain}/${method}${path ? '/' + path : '/'}`;
+  const _session = SESSION_OBJ[SESSION_ID] || {};
+  const origin =
+    ((typeof globalThis !== 'undefined' && globalThis.__XU_SERVER_ORIGIN__)) ||
+    (_session.domain ? `https://${_session.domain}` : '');
+
+  if (!origin) {
+    return `/${method}${path ? '/' + path : '/'}`;
+  }
+
+  return `${origin}/${method}${path ? '/' + path : '/'}`;
 };
 
 var UI_FRAMEWORK_INSTALLED = null;
@@ -2467,8 +2487,24 @@ func.common.get_module = async function (SESSION_ID, module, paramsP = {}) {
     return module_ret;
   };
   const _session = SESSION_OBJ[SESSION_ID];
+  const append_ts = function (resource_path) {
+    const cache_tag =
+      _session?.build_info?.runtime_ts ||
+      _session?.build_info?.last_changed_ts ||
+      _session?.build_info?.server_ts ||
+      _session?.opt?.app_build_id ||
+      (typeof globalThis !== 'undefined' ? globalThis.__XU_SERVER_BOOTSTRAP__?.version : 0) ||
+      0;
+
+    if (!cache_tag) {
+      return resource_path;
+    }
+
+    return `${resource_path}${resource_path.includes('?') ? '&' : '?'}ts=${cache_tag}`;
+  };
+
   if (_session.worker_type === 'Dev') {
-    ret = await get_ret('./modules/' + module);
+    ret = await get_ret(append_ts('./modules/' + module));
 
     return ret;
   }
@@ -2476,7 +2512,15 @@ func.common.get_module = async function (SESSION_ID, module, paramsP = {}) {
     if (typeof IS_DOCKER !== 'undefined' || typeof IS_PROCESS_SERVER !== 'undefined') {
       ret = await get_ret(func.utils.get_resource_filename(['live_preview', 'miniapp'].includes(_session.engine_mode) ? '' : _session?.opt?.app_build_id, `${_conf.xuda_home}root/dist/runtime/js/modules/` + module));
     } else {
-      ret = await get_ret(func.common.get_url(SESSION_ID, 'dist', func.utils.get_resource_filename(['live_preview', 'miniapp'].includes(_session.engine_mode) ? '' : _session?.opt?.app_build_id, 'runtime/js/modules/' + module)));
+      ret = await get_ret(
+        append_ts(
+          func.common.get_url(
+            SESSION_ID,
+            'dist',
+            func.utils.get_resource_filename(['live_preview', 'miniapp'].includes(_session.engine_mode) ? '' : _session?.opt?.app_build_id, 'runtime/js/modules/' + module),
+          ),
+        ),
+      );
     }
 
     return ret;
@@ -2489,7 +2533,15 @@ func.common.get_module = async function (SESSION_ID, module, paramsP = {}) {
   if (typeof IS_DOCKER !== 'undefined' || typeof IS_PROCESS_SERVER !== 'undefined') {
     ret = await get_ret(func.utils.get_resource_filename(['live_preview', 'miniapp'].includes(_session.engine_mode) ? '' : _session?.opt?.app_build_id, `${_conf.xuda_home}root/dist/runtime/js/modules/` + rep()));
   } else {
-    ret = await get_ret(func.common.get_url(SESSION_ID, 'dist', func.utils.get_resource_filename(['live_preview', 'miniapp'].includes(_session.engine_mode) ? '' : _session?.opt?.app_build_id, 'runtime/js/modules/' + rep())));
+    ret = await get_ret(
+      append_ts(
+        func.common.get_url(
+          SESSION_ID,
+          'dist',
+          func.utils.get_resource_filename(['live_preview', 'miniapp'].includes(_session.engine_mode) ? '' : _session?.opt?.app_build_id, 'runtime/js/modules/' + rep()),
+        ),
+      ),
+    );
   }
 
   return ret;
@@ -2710,7 +2762,10 @@ func.common.perform_rpi_request = async function (SESSION_ID, serviceP, opt = {}
     const app_id = _session.app_id;
 
     if (APP_OBJ[app_id].is_deployment && _session.rpi_http_methods?.includes(serviceP)) {
-      url = 'https://' + _session.host + '/rpi/';
+      const origin =
+        ((typeof globalThis !== 'undefined' && globalThis.__XU_SERVER_ORIGIN__)) ||
+        (_session.host ? 'https://' + _session.host : '');
+      url = origin ? origin + '/rpi/' : url;
     }
 
     url += serviceP;
@@ -5151,9 +5206,9 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
 
         try {
           const row_idx = find_ROWID_idx_from_raw_data_arr('newRecord');
-          _raw_data_rows[row_idx] = [{ id: 'newRecord', value: {} }];
+          _raw_data_rows[row_idx] = { id: 'newRecord', value: {} };
         } catch (error) {
-          _raw_data_rows.push({ _ROWID: 'newRecord' });
+          _raw_data_rows.push({ id: 'newRecord', value: {} });
         }
       }
 
@@ -7200,25 +7255,54 @@ func.datasource.update_changes_for_out_parameter = async function (SESSION_ID, d
   let _session = SESSION_OBJ[SESSION_ID];
   let _ds = _session.DS_GLB[dsSessionP];
   const _calling_ds = _session.DS_GLB[calling_dsP];
+  const get_row_idx_safe = function (target_ds, row_id) {
+    if (!target_ds || !row_id) {
+      return null;
+    }
+    try {
+      return func.common.find_ROWID_idx(target_ds, row_id);
+    } catch (_error) {
+      return null;
+    }
+  };
 
-  if (_ds.PARAM_OUT_INFO) {
-    let data = {};
-    for await (const [key, val] of Object.entries(_ds.PARAM_OUT_INFO)) {
-      if (val.prop === 'out') {
-        try {
-          const row_idx = func.common.find_ROWID_idx(_ds, _ds.currentRecordId);
-          data[val.details] = _ds.data_feed.rows[row_idx][val.fieldId];
-        } catch (err) {
-          console.error(err);
+  if (!_ds?.PARAM_OUT_INFO || !calling_dsP || !_calling_ds) {
+    return;
+  }
+
+  let data = {};
+  for await (const [key, val] of Object.entries(_ds.PARAM_OUT_INFO)) {
+    if (val.prop === 'out') {
+      try {
+        const current_row_idx = get_row_idx_safe(_ds, _ds.currentRecordId);
+        const dataset_row_idx = get_row_idx_safe(_ds, 'dataset');
+        let result;
+
+        if (
+          current_row_idx !== null &&
+          typeof _ds?.data_feed?.rows?.[current_row_idx]?.[val.fieldId] !== 'undefined'
+        ) {
+          result = _ds.data_feed.rows[current_row_idx][val.fieldId];
+        } else if (
+          dataset_row_idx !== null &&
+          typeof _ds?.data_feed?.rows?.[dataset_row_idx]?.[val.fieldId] !== 'undefined'
+        ) {
+          result = _ds.data_feed.rows[dataset_row_idx][val.fieldId];
         }
+
+        if (typeof result !== 'undefined') {
+          data[val.details] = result;
+        }
+      } catch (err) {
+        console.error(err);
       }
     }
-    if (!xu_isEmpty(data)) {
-      let datasource_changes = {
-        [calling_dsP]: { [_calling_ds.currentRecordId]: data },
-      };
-      await func.datasource.update(SESSION_ID, datasource_changes);
-    }
+  }
+  if (!xu_isEmpty(data)) {
+    let datasource_changes = {
+      [calling_dsP]: { [_calling_ds.currentRecordId]: data },
+    };
+    await func.datasource.update(SESSION_ID, datasource_changes);
   }
 };
 
@@ -8076,6 +8160,11 @@ func.utils.clean_stringify_null = function (key, value) {
 };
 
 func.utils.load_js_on_demand = async function (js_src, type) {
+  const normalized_src = typeof js_src === 'string' ? js_src.trim() : '';
+  if (!normalized_src || normalized_src === 'undefined' || normalized_src === 'null') {
+    return false;
+  }
+
   const get_script = function (callback) {
     if (glb.IS_WORKER) {
       callback();
@@ -8085,12 +8174,12 @@ func.utils.load_js_on_demand = async function (js_src, type) {
       return GLB_JS_SCRIPTS_LOADED.includes(src);
     }
 
-    if (isScriptLoaded(js_src)) {
+    if (isScriptLoaded(normalized_src)) {
       callback(false);
     } else {
-      func.runtime.platform.load_script(js_src, type, function () {
+      func.runtime.platform.load_script(normalized_src, type, function () {
         callback(true);
-        GLB_JS_SCRIPTS_LOADED.push(js_src);
+        GLB_JS_SCRIPTS_LOADED.push(normalized_src);
       });
     }
   };
@@ -8101,7 +8190,11 @@ func.utils.load_js_on_demand = async function (js_src, type) {
 };
 
 func.utils.load_css_on_demand = function (css_href) {
-  func.runtime.platform.load_css(css_href);
+  const normalized_href = typeof css_href === 'string' ? css_href.trim() : '';
+  if (!normalized_href || normalized_href === 'undefined' || normalized_href === 'null') {
+    return null;
+  }
+  return func.runtime.platform.load_css(normalized_href);
 };
 
 func.utils.remove_js_css_file = function (filename, filetype) {
@@ -9165,6 +9258,17 @@ func.utils.find_key_in_ViewUITreeObj = function (arr, key, val) {
 };
 
 func.utils.get_plugin_setup = function (SESSION_ID, plugin_name) {
+  const _session = SESSION_OBJ[SESSION_ID];
+  const normalize_setup_response = function (value) {
+    if (value && typeof value === 'object' && Object.prototype.hasOwnProperty.call(value, 'code')) {
+      return value;
+    }
+
+    return {
+      code: 1,
+      data: value && typeof value === 'object' ? value : {},
+    };
+  };
   const report_error = function (descP, warn) {
     func.utils.debug.log(SESSION_ID, plugin_name, {
       module: 'plugin',
@@ -9182,20 +9286,28 @@ func.utils.get_plugin_setup = function (SESSION_ID, plugin_name) {
   return new Promise(async (resolve, reject) => {
     try {
       const db = await func.utils.connect_pouchdb(SESSION_ID);
+      const should_bypass_cache =
+        _session?.worker_type === 'Dev' ||
+        (_session?.engine_mode === 'miniapp' && !_session?.app_token);
 
-      try {
-        let ret = await db.get(`cache_plugin_setup_${plugin_name}`);
-        return resolve(ret.data);
-      } catch (err) {
-        // cache not found
-        const json = await func.common.db(SESSION_ID, 'get_plugin_setup', {
-          plugin_name,
-        });
-        if (json.code < 0) {
-          report_error('Error: ' + json.data, json.error_type === 'W' ? true : false);
+      if (!should_bypass_cache) {
+        try {
+          let ret = await db.get(`cache_plugin_setup_${plugin_name}`);
+          return resolve(normalize_setup_response(ret.data));
+        } catch (err) {
+          // cache miss
         }
-        resolve(json);
+      }
 
+      const json = normalize_setup_response(await func.common.db(SESSION_ID, 'get_plugin_setup', {
+        plugin_name,
+      }));
+      if (json.code < 0) {
+        report_error('Error: ' + json.data, json.error_type === 'W' ? true : false);
+      }
+      resolve(json);
+
+      if (!should_bypass_cache) {
         var doc = {
           _id: `cache_plugin_setup_${plugin_name}`,
           data: json,
@@ -9206,8 +9318,13 @@ func.utils.get_plugin_setup = function (SESSION_ID, plugin_name) {
     } catch (e) {
       console.error(e);
 
-      report_error('Error: ' + e.msg, e.error_type === 'W' ? true : false);
-      resolve(e.msg);
+      const error_message = e?.message || e?.msg || String(e || 'Unknown plugin setup error');
+      report_error('Error: ' + error_message, e?.error_type === 'W' ? true : false);
+      resolve({
+        code: -1,
+        data: error_message,
+        error_type: e?.error_type,
+      });
     }
   });
 };
@@ -9365,16 +9482,23 @@ func.utils.call_plugin_api = function (SESSION_ID, plugin_nameP, dataP) {
 
 func.utils.get_plugin_resource = function (SESSION_ID, plugin_name, plugin_resource) {
   var _session = SESSION_OBJ[SESSION_ID];
+  const resource_ts =
+    _session?.build_info?.runtime_ts ||
+    _session?.build_info?.last_changed_ts ||
+    _session?.build_info?.server_ts ||
+    _session?.opt?.app_build_id ||
+    (typeof globalThis !== 'undefined' ? globalThis.__XU_SERVER_BOOTSTRAP__?.version : 0) ||
+    0;
 
   const get_path = function (resource) {
     if (_session.worker_type === 'Dev') {
-      return `../../plugins/${plugin_name}/${resource}`;
+      return `../../plugins/${plugin_name}/${resource}?ts=${resource_ts}`;
     }
     if (typeof IS_PROCESS_SERVER !== 'undefined') {
       return `${_conf.plugins_drive_path}/${_session.app_id}/node_modules/${plugin_name}/${resource}`;
     } else {
       // return `./node_modules/${plugin_name}/${resource}?app_id=${_session.app_id}`;
-      return `https://${_session.domain}/plugins/${plugin_name}/${resource}?app_id=${_session.app_id}&ts=${_session?.opt?.app_build_id || 0}`;
+      return `https://${_session.domain}/plugins/${plugin_name}/${resource}?app_id=${_session.app_id}&ts=${resource_ts}`;
     }
   };
 
@@ -9465,6 +9589,13 @@ func.utils.remove_cached_objects = async function (SESSION_ID) {
 
 func.utils.get_plugin_npm_cdn = async function (SESSION_ID, plugin_name, resource) {
   const _session = SESSION_OBJ[SESSION_ID];
+  const resource_ts =
+    _session?.build_info?.runtime_ts ||
+    _session?.build_info?.last_changed_ts ||
+    _session?.build_info?.server_ts ||
+    _session?.opt?.app_build_id ||
+    (typeof globalThis !== 'undefined' ? globalThis.__XU_SERVER_BOOTSTRAP__?.version : 0) ||
+    0;
 
   const local_plugin_resource_url = await func.utils.get_local_studio_plugin_resource_url(SESSION_ID, plugin_name, resource);
   if (local_plugin_resource_url) {
@@ -9473,10 +9604,10 @@ func.utils.get_plugin_npm_cdn = async function (SESSION_ID, plugin_name, resourc
 
   const get_path = function (resource) {
     if (_session.worker_type === 'Dev') {
-      return `../../plugins/${plugin_name}/${resource}`;
+      return `../../plugins/${plugin_name}/${resource}?ts=${resource_ts}`;
     }
 
-    return `https://${_session.domain}/plugins/${plugin_name}/${resource}?app_id=${_session.app_id}&ts=${_session?.opt?.app_build_id || 0}`;
+    return `https://${_session.domain}/plugins/${plugin_name}/${resource}?app_id=${_session.app_id}&ts=${resource_ts}`;
   };
 
   return get_path(resource);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-worker-bundle",
-  "version": "1.3.2714",
+  "version": "1.4.7",
   "description": "xuda framework",
   "main": "index.js",
   "scripts": {