@xuda.io/xuda-worker-bundle 1.3.2613 → 1.3.2615

package/index.js

@@ -185,6 +185,96 @@ func.runtime.platform = {
     return true;
   },
 };
+
+// ── Platform-agnostic event bus ──
+// Works in browser, worker, and Node environments.
+// In browser, bridge DOM events into this bus so core code never touches $(document) directly.
+func.runtime.platform._event_bus = {};
+func.runtime.platform.on = function (name, handler) {
+  if (!func.runtime.platform._event_bus[name]) {
+    func.runtime.platform._event_bus[name] = [];
+  }
+  func.runtime.platform._event_bus[name].push(handler);
+};
+func.runtime.platform.off = function (name, handler) {
+  const handlers = func.runtime.platform._event_bus[name];
+  if (!handlers) return;
+  if (!handler) {
+    delete func.runtime.platform._event_bus[name];
+    return;
+  }
+  const index = handlers.indexOf(handler);
+  if (index !== -1) {
+    handlers.splice(index, 1);
+  }
+};
+func.runtime.platform.emit = function (name, data) {
+  const handlers = func.runtime.platform._event_bus[name];
+  if (handlers) {
+    for (let i = 0; i < handlers.length; i++) {
+      handlers[i](data);
+    }
+  }
+  // also fire on DOM if in browser (for backward compatibility with $(document).on listeners)
+  if (func.runtime.platform.has_document() && typeof $ !== 'undefined') {
+    $(document).trigger(name, Array.isArray(data) ? data : [data]);
+  }
+};
+
+// ── Platform helpers for DOM-independent resource loading ──
+func.runtime.platform.load_script = function (url, type, callback) {
+  if (typeof document !== 'undefined') {
+    const script = document.createElement('script');
+    script.src = url;
+    if (type) script.type = type;
+    script.onload = callback;
+    document.head.appendChild(script);
+  } else if (callback) {
+    callback();
+  }
+};
+func.runtime.platform.load_css = function (href) {
+  if (typeof document === 'undefined') return;
+  try {
+    if (document.querySelector('link[href="' + href + '"]')) return;
+  } catch (err) {
+    return;
+  }
+  const link = document.createElement('link');
+  link.rel = 'stylesheet';
+  link.type = 'text/css';
+  link.href = href;
+  document.head.insertBefore(link, document.head.firstChild);
+};
+func.runtime.platform.remove_js_css = function (filename, filetype) {
+  if (typeof document === 'undefined') return;
+  const tagName = filetype === 'js' ? 'script' : filetype === 'css' ? 'link' : 'none';
+  const attr = filetype === 'js' ? 'src' : filetype === 'css' ? 'href' : 'none';
+  const elements = document.getElementsByTagName(tagName);
+  for (let i = elements.length - 1; i >= 0; i--) {
+    if (elements[i] && elements[i].getAttribute(attr) != null && elements[i].getAttribute(attr).indexOf(filename) !== -1) {
+      elements[i].parentNode.removeChild(elements[i]);
+    }
+  }
+};
+func.runtime.platform.inject_css = function (cssText) {
+  if (typeof document === 'undefined' || !cssText) return;
+  const style = document.createElement('style');
+  style.type = 'text/css';
+  style.textContent = cssText;
+  document.head.appendChild(style);
+};
+func.runtime.platform.set_title = function (title) {
+  if (typeof document !== 'undefined') {
+    document.title = title;
+  }
+};
+func.runtime.platform.set_cursor = function (element, cursor) {
+  if (typeof $ !== 'undefined' && element) {
+    $(element).css('cursor', cursor);
+  }
+};
+
 func.runtime.env = {
   get_url_params: function () {
     const search = func.runtime.platform.get_url_search();
@@ -3748,7 +3838,8 @@ func.datasource.execute_view_events = async function (SESSION_ID, dataSourceSess
       if (cond) {
         var elem_params = undefined;
         if (!glb.IS_WORKER) {
-          elem_params = $('#' + _ds.containerId).data('params');
+          const container_meta = func.runtime.ui.get_meta_by_element_id(_ds.containerId);
+          elem_params = container_meta?.params;
         }
         const ret = await func.events.execute(
           SESSION_ID,
@@ -3884,13 +3975,12 @@ func.datasource.clean = function (SESSION_ID, screenIdP) {
   var arr = [];
   for (const [key, val] of Object.entries(SESSION_OBJ[SESSION_ID].DS_GLB)) {
     try {
+      const screen_parent_id = (typeof $ !== 'undefined' && val.screenId) ? $('#' + val.screenId).parent().attr('id') : null;
       if (
         Number(key) > 0 &&
         (val.screenId === screenIdP ||
           val.rootScreenId === screenIdP ||
-          $('#' + val.screenId)
-            .parent()
-            .attr('id') === screenIdP ||
+          screen_parent_id === screenIdP ||
           (val && val.parentDataSourceNo && arr.includes(val.parentDataSourceNo.toString())))
       ) {
         arr.push(key);
@@ -3959,9 +4049,7 @@ func.datasource.del = function (SESSION_ID, dsP) {
     _.forEach(SESSION_OBJ[SESSION_ID].WORKER_OBJ.jobs, function (val, key) {
       if (val && val.dsSessionP == dsP) {
         arr.push(key);
-        for (const [key, val] of Object.entries($('.screen_blocker'))) {
-          $(val).remove();
-        }
+        func.runtime.ui.clear_screen_blockers();
       }
     });
     for (let val of arr.reverse()) {
@@ -3982,10 +4070,13 @@ func.datasource.del = function (SESSION_ID, dsP) {
         }
       }
     }
-    if ($(SESSION_OBJ[SESSION_ID].root_element).find('xu-nav').length) {
-      var ds_obj = $(SESSION_OBJ[SESSION_ID].root_element).find('xu-nav')?.data()?.xuData.nav_params;
-      if (ds_obj) {
-        delete ds_obj[dsP];
+    if (typeof $ !== 'undefined') {
+      const $xu_nav = $(SESSION_OBJ[SESSION_ID].root_element).find('xu-nav');
+      if ($xu_nav.length) {
+        var ds_obj = func.runtime.ui.get_data($xu_nav)?.xuData?.nav_params;
+        if (ds_obj) {
+          delete ds_obj[dsP];
+        }
       }
     }
   }
@@ -4316,7 +4407,7 @@ func.datasource.callback = async function (SESSION_ID, dsSessionP, rowIdP, jobNo
     dsSession: dsSessionP,
     prop: _ds.log_prop + ' ' + 'adapter',
   });
-  if (!glb.IS_WORKER) $(_session.root_element).css('cursor', 'default');
+  if (!glb.IS_WORKER) func.runtime.platform.set_cursor(_session.root_element, 'default');
 
   if (_ds.prog_id) {
     let _ds = _session.DS_GLB[dsSessionP];
@@ -5386,7 +5477,7 @@ func.utils.job_worker = function (session_id) {
     func.utils.debug_report(SESSION_ID, 'utils.worker.reset', 'worker not responding', 'E', '', _session.WORKER_OBJ.jobs);
     _session.WORKER_OBJ.jobs = [];
     _session.WORKER_OBJ.stat = null;
-    $('.screen_blocker').remove();
+    func.runtime.ui.clear_screen_blockers();
   };
   return {
     _interval: null,
@@ -5527,8 +5618,9 @@ func.utils.makeid = function (length) {
 func.utils.get_device = function () {
   var device;
   try {
-    if (window.cordova) {
-      device = window.cordova.platformId;
+    const win = func.runtime.platform.get_window();
+    if (win?.cordova) {
+      device = win.cordova.platformId;
     }
   } catch (e) {
     console.error('error using ui element in server side request');
@@ -5869,16 +5961,8 @@ func.utils.clean_stringify_null = function (key, value) {
 
 func.utils.load_js_on_demand = async function (js_src, type) {
   const get_script = function (callback) {
-    function getScript(scriptUrl, callback) {
-      const script = document.createElement('script');
-      script.src = scriptUrl;
-      if (type) script.type = type;
-      script.onload = callback;
-
-      document.head.appendChild(script);
-    }
     if (glb.IS_WORKER) {
-      callback(script);
+      callback();
       return;
     }
     function isScriptLoaded(src) {
@@ -5888,8 +5972,7 @@ func.utils.load_js_on_demand = async function (js_src, type) {
     if (isScriptLoaded(js_src)) {
       callback(false);
     } else {
-      getScript(js_src, function (response, status) {
-        // console.log(response,status)
+      func.runtime.platform.load_script(js_src, type, function () {
         callback(true);
         GLB_JS_SCRIPTS_LOADED.push(js_src);
       });
@@ -5902,33 +5985,11 @@ func.utils.load_js_on_demand = async function (js_src, type) {
 };
 
 func.utils.load_css_on_demand = function (css_href) {
-  function isCssLoaded(src) {
-    try {
-      return document.querySelector('link[href="' + src + '"]') ? true : false;
-    } catch (err) {
-      console.warn(`load css ${css_href} failed`);
-      return true;
-    }
-  }
-
-  if (isCssLoaded(css_href)) {
-    return;
-  }
-  return $('<link/>', {
-    rel: 'stylesheet',
-    type: 'text/css',
-    href: css_href,
-  }).prependTo('head');
+  func.runtime.platform.load_css(css_href);
 };
 
 func.utils.remove_js_css_file = function (filename, filetype) {
-  var targetelement = filetype == 'js' ? 'script' : filetype == 'css' ? 'link' : 'none'; //determine element type to create nodelist from
-  var targetattr = filetype == 'js' ? 'src' : filetype == 'css' ? 'href' : 'none'; //determine corresponding attribute to test for
-  var allsuspects = document.getElementsByTagName(targetelement);
-  for (var i = allsuspects.length; i >= 0; i--) {
-    //search backwards within node list for matching elements to remove
-    if (allsuspects[i] && allsuspects[i].getAttribute(targetattr) != null && allsuspects[i].getAttribute(targetattr).indexOf(filename) != -1) allsuspects[i].parentNode.removeChild(allsuspects[i]); //remove element by calling parentNode.removeChild()
-  }
+  func.runtime.platform.remove_js_css(filename, filetype);
 };
 
 func.utils.replace_studio_drive_url = function (SESSION_ID, val) {
@@ -7237,17 +7298,19 @@ func.events.validate = async function (SESSION_ID, triggerP, dsSessionP, eventId
                       if (_ds.panel_div_id) {
                         try {
                           container = '#' + _ds.panel_div_id;
-                          if ($(container).data().xuData.panel_info) {
-                            screen_prop = $(container).data().xuData.panel_info.paramsP;
+                          const panel_meta = func.runtime.ui.get_meta_by_element_id(_ds.panel_div_id);
+                          if (panel_meta?.xuData?.panel_info) {
+                            screen_prop = panel_meta.xuData.panel_info.paramsP;
                           } else {
                             ///////////////
                             container = '#' + _session.DS_GLB[dsSessionP].screenId;
+                            const screen_meta = func.runtime.ui.get_meta_by_element_id(_session.DS_GLB[dsSessionP].screenId);
 
-                            if ($(container) && $(container).data()) {
-                              screen_prop = $(container).data().xuData.paramsP;
+                            if (screen_meta?.xuData) {
+                              screen_prop = screen_meta.xuData.paramsP;
                             }
 
-                            if (!$(container) || !$(container).length) {
+                            if (!screen_meta) {
                               container = '#' + _session.DS_GLB[dsSessionP].containerId;
                             }
                             //////////////
@@ -7257,12 +7320,13 @@ func.events.validate = async function (SESSION_ID, triggerP, dsSessionP, eventId
                         }
                       } else {
                         container = '#' + _ds.screenId;
+                        const screen_meta = func.runtime.ui.get_meta_by_element_id(_ds.screenId);
 
-                        if ($(container) && $(container).data()) {
-                          screen_prop = $(container).data().xuData.paramsP;
+                        if (screen_meta?.xuData) {
+                          screen_prop = screen_meta.xuData.paramsP;
                         }
 
-                        if (!$(container) || !$(container).length) {
+                        if (!screen_meta) {
                           container = '#' + _ds.containerId;
                         }
                       }
@@ -7663,7 +7727,7 @@ func.events.execute = async function (
       var $calling_container;
       if (_session.WORKER_OBJ.jobs[job_index]) {
         if (_session.WORKER_OBJ.jobs[job_index].paramsP) {
-          $calling_container = $('#' + _session.WORKER_OBJ.jobs[job_index].paramsP.callingContainerP);
+          $calling_container = func.runtime.ui.find_element_by_id(_session.WORKER_OBJ.jobs[job_index].paramsP.callingContainerP);
         } else {
           $calling_container = ''; // calling from datasource 0
           _session.WORKER_OBJ.jobs[job_index].paramsP = {};
@@ -7679,7 +7743,7 @@ func.events.execute = async function (
       return await func.runtime.ui.init_screen({
         SESSION_ID,
         prog_id: await get_prog_id(),
-        sourceScreenP: $(containerP)?.data()?.xuData.screenId,
+        sourceScreenP: func.runtime.ui.get_data(containerP)?.xuData?.screenId,
         callingDataSource_objP: _session.DS_GLB[dsSession],
         $callingContainerP: $calling_container,
         triggerIdP: eventIdP,
@@ -7926,7 +7990,7 @@ func.events.execute = async function (
     emit_event: async function () {
       if (refIdP.value) {
         //  if (descP.value) {
-        $(document).trigger(refIdP.value, [_session.DS_GLB[dsSession]]);
+        func.runtime.platform.emit(refIdP.value, [_session.DS_GLB[dsSession]]);
       } else {
         func.utils.debug_report(SESSION_ID, 'func.events.execute', 'Event name missing', 'E');
       }
@@ -8027,12 +8091,14 @@ func.events.execute = async function (
       for await (const [key, val] of Object.entries(obj_values_to_update)) {
         var $element;
 
+        var iterate_info = null;
         if (elementP) {
-          $element = $(`[xu-ui-id="${elementP}"]`).clone(true);
+          const element_meta = func.runtime.ui.get_meta(elementP, 'xuData');
+          iterate_info = element_meta?.iterate_info || null;
         }
 
-        let ret_field_id = await func.expression.get(SESSION_ID, val.id.trim(), dsSessionP, 'update', null, null, null, null, null, null, $element?.length ? $element?.data()?.xuData?.iterate_info : null);
-        let ret_value = await func.expression.get(SESSION_ID, val.val.trim(), dsSessionP, 'update', null, null, null, null, null, null, $element?.length ? $element?.data()?.xuData?.iterate_info : null);
+        let ret_field_id = await func.expression.get(SESSION_ID, val.id.trim(), dsSessionP, 'update', null, null, null, null, null, null, iterate_info);
+        let ret_value = await func.expression.get(SESSION_ID, val.val.trim(), dsSessionP, 'update', null, null, null, null, null, null, iterate_info);
         let _field_id = ret_field_id.result;
         let _value = ret_value.result;
 
@@ -8357,7 +8423,7 @@ func.events.check_jobs_idle = async function (SESSION_ID, jobsP) {
       }
     }, 100);
     var do_callback = function () {
-      window.clearInterval(listener);
+      clearInterval(listener);
       resolve();
     };
   });
@@ -8369,7 +8435,7 @@ setInterval(function () {
 }, 1000);
 
 func.events.set_browser_changes = function (dsP, fieldsChangedP) {
-  if (fieldsChangedP.includes('SYS_GLOBAL_STR_BROWSER_TITLE')) document.title = dsP.dataset_new['SYS_GLOBAL_STR_BROWSER_TITLE'];
+  if (fieldsChangedP.includes('SYS_GLOBAL_STR_BROWSER_TITLE')) func.runtime.platform.set_title(dsP.dataset_new['SYS_GLOBAL_STR_BROWSER_TITLE']);
 };
 
 func.events.execute_PENDING_OPEN_URL_EVENTS = async function () {
@@ -8392,7 +8458,7 @@ func.events.execute_PENDING_OPEN_URL_EVENTS = async function () {
           prog_id: params_obj.prog,
           sourceScreenP: null,
           callingDataSource_objP: null,
-          $callingContainerP: $('#embed_' + SESSION_ID),
+          $callingContainerP: func.runtime.ui.get_session_root(SESSION_ID),
           triggerIdP: null,
           rowIdP: null,
           jobNoP: null,

package/package.json

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