@xuda.io/xuda-worker-bundle-min 1.3.1173 → 1.3.1175

package/index.js

@@ -2202,17 +2202,13 @@ func.datasource.execute = async function (
       typeof IS_PROCESS_SERVER === "undefined" && _ds.viewSourceProp === "globals") {
 
       if (!["main"].includes(_session.opt.app_computing_mode)) {
-
         await func.index.call_worker(SESSION_ID, {
           service: "create_webworker_globals",
           data: { ds_data: _ds, session_id: SESSION_ID },
         });
       }
-
-
     }
 
-
     if (
       await func.datasource.get_view_events_count(
         SESSION_ID,
@@ -3221,60 +3217,63 @@ func.datasource.run_events_functions = async function (
   calling_job,
   NA_calling_job_ds
 ) {
-  return new Promise(async (resolve, reject) => {
-    var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
-    var args = _ds.args;
-    // var v = _ds.v;
-    const _view_obj = await func.utils.VIEWS_OBJ.get(SESSION_ID, _ds.prog_id);
-    let job_promises = []
-    if (_view_obj.progEvents) {
-      for await (const [key, val] of Object.entries(_view_obj.progEvents)) {
-        if (
-          val.data.type === "user_defined" &&
-          val.data.event_name &&
-          val.data.event_name === event_id
-        ) {
-          const jobs = await func.events.validate(
-            SESSION_ID,
-            "user_defined",
-            dataSourceSession,
-            val.data.event_name,
-            args.callingSourceP,
-            val.data.parameters
-          );
-          for (job_num of jobs) {
-            job_promises.push(new Promise((resolve, reject) => {
-              const interval = setInterval(() => {
-                var job_index = func.events.find_job_index(SESSION_ID, job_num);
-                if (job_index == null) {
-                  clearInterval(interval)
-                  resolve(job_num);
-                }
-              }, 100);
-            }))
-          }
+  // return new Promise(async (resolve, reject) => {
+  var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
+  var args = _ds.args;
+  // var v = _ds.v;
+  const _view_obj = await func.utils.VIEWS_OBJ.get(SESSION_ID, _ds.prog_id);
+  // let job_promises = []
+  if (_view_obj.progEvents) {
+    for await (const [key, val] of Object.entries(_view_obj.progEvents)) {
+      if (
+        val.data.type === "user_defined" &&
+        val.data.event_name &&
+        val.data.event_name === event_id
+      ) {
+        const jobs = await func.events.validate(
+          SESSION_ID,
+          "user_defined",
+          dataSourceSession,
+          val.data.event_name,
+          args.callingSourceP,
+          val.data.parameters
+        );
+
+        if (!calling_job) continue
+
+        for (job_num of jobs) {
+          job_promises.push(new Promise((resolve, reject) => {
+            const interval = setInterval(() => {
+              var job_index = func.events.find_job_index(SESSION_ID, job_num);
+              if (job_index == null) {
+                clearInterval(interval)
+                resolve(job_num);
+              }
+            }, 100);
+          }))
         }
       }
+    }
 
 
 
-    }
-    if (job_promises.length) {
-      await Promise.all(job_promises)
-    }
-    resolve()
+  }
+  if (job_promises.length) {
+    await Promise.all(job_promises)
+  }
+  // resolve()
 
-    // if (job_promises.length) {
-    //   Promise.all(job_promises)
-    //     .then((e) => {
-    //       resolve()
-    //     });
+  // if (job_promises.length) {
+  //   Promise.all(job_promises)
+  //     .then((e) => {
+  //       resolve()
+  //     });
 
-    // } else {
-    //   resolve()
-    // }
+  // } else {
+  //   resolve()
+  // }
 
-  })
+  // })
 
 };
 

package/package.json

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