From 79ddff1cbd9e6ef9d7820da0bed8f7eb2d7a9e2d Mon Sep 17 00:00:00 2001
From: DanyLE <xsang.le@gmail.com>
Date: Thu, 1 Jun 2023 12:24:34 +0200
Subject: [PATCH] libantosdk: linux worker is renamed to backend, linux-exec
 job renamed to cmd-exec, add lua-exec job for backend lua script execution

---
 Blogger/build.json                            |   6 ++-
 Blogger/build/release/Blogger.zip             | Bin 15605 -> 15605 bytes
 libantosdk/README.md                          |   1 +
 libantosdk/build/debug/README.md              |   1 +
 .../{linux.worker.js => backend.worker.js}    |  36 ++++++++++++------
 libantosdk/build/debug/package.json           |   2 +-
 libantosdk/build/release/libantosdk.zip       | Bin 947550 -> 947658 bytes
 .../{linux.worker.js => backend.worker.js}    |  36 ++++++++++++------
 libantosdk/package.json                       |   2 +-
 libantosdk/project.json                       |   8 ----
 10 files changed, 58 insertions(+), 34 deletions(-)
 rename libantosdk/build/debug/core/{linux.worker.js => backend.worker.js} (71%)
 rename libantosdk/core/{linux.worker.js => backend.worker.js} (71%)
 delete mode 100644 libantosdk/project.json

diff --git a/Blogger/build.json b/Blogger/build.json
index d204b72..d7c2208 100644
--- a/Blogger/build.json
+++ b/Blogger/build.json
@@ -19,8 +19,10 @@
             ],
             "jobs": [
                 {
-                    "name": "ts-import",
-                    "data": ["sdk://core/ts/core.d.ts", "sdk://core/ts/jquery.d.ts","sdk://core/ts/antos.d.ts"]
+                    "name": "ts-antos-sdk",
+                    "data": {
+                        "version": "2.0.x"
+                    }
                 },
                 {
                     "name": "ts-compile",
diff --git a/Blogger/build/release/Blogger.zip b/Blogger/build/release/Blogger.zip
index 2d6568b9df2030dc083186551bfc0f3b2bc2c63e..231996c952bfdf0f9c29db9222de8b69dce75d59 100644
GIT binary patch
delta 250
zcmexb`L&WKz?+$ci-CcGgP|mGBagl$Q%T}xTS<N<5N)P(hnWQ=vDr_09t%k1oxBSZ
z3j;%G;$$&31*X!(%@%6E7=iR;6Afh$*H&jO6Nrw~c*G2%-{`f1q&F8E?B@jPpKM}f
z45BivOhJ@@wG5M!^khA2aj-3u7g)(KDalXXXC(!ay=5gMbx4_kAvZBIPcON+IKZ2c
zNrVC9R<Hv+tqp)CPp-DM0Z}`xjX{*2jm%^&8}7-WHX<PIJD>%Bv?lY|fZRGc+r|Mz
It+nw00O;pR9smFU

delta 279
zcmexb`L&WKz?+$ci-CcGgP|y4Bagl$Q*pv(TS<N<5UnRaj|D`ZQ+8ou;a~u={G{(N
zvoHWzlf~2&KvEWJzZik^WD^Z#5SK&y5i^L6)L08P;f-D^NP2Uz!G2DrBA_xWW02}h
zD^n14(@Mt1Nt%J7ATc>RF+Ei;t2jR|z?+dtgaP8B;)H!+ERPnwQDS0X-~tM90NsfI
zkK`vCT8n_)HF<%R43n19<b77+5Z8HH8-OgRwzdILJFUUCYTL+6=Ca|Q9AqO75`AYa
V!(^y4na4&J#LKpE08wjgJOI<UO=SQ8

diff --git a/libantosdk/README.md b/libantosdk/README.md
index 3b9d957..5fdf758 100644
--- a/libantosdk/README.md
+++ b/libantosdk/README.md
@@ -2,6 +2,7 @@
 AntOSDK: development API for AntOS based applications/projects
 
 ## Change logs
+- 0.1.1: linux worker is renamed to backend, linux-exec job re to cmd-exec, add lua-exec job for backend lua script execution
 - 0.1.0: antOS SDK is no longer delivered in this package, it will be fetched directly from AntOS release site
 - 0.0.18: Add some public API on grid view
 - 0.0.17: Use lastest AntOS d.ts file
diff --git a/libantosdk/build/debug/README.md b/libantosdk/build/debug/README.md
index 3b9d957..5fdf758 100644
--- a/libantosdk/build/debug/README.md
+++ b/libantosdk/build/debug/README.md
@@ -2,6 +2,7 @@
 AntOSDK: development API for AntOS based applications/projects
 
 ## Change logs
+- 0.1.1: linux worker is renamed to backend, linux-exec job re to cmd-exec, add lua-exec job for backend lua script execution
 - 0.1.0: antOS SDK is no longer delivered in this package, it will be fetched directly from AntOS release site
 - 0.0.18: Add some public API on grid view
 - 0.0.17: Use lastest AntOS d.ts file
diff --git a/libantosdk/build/debug/core/linux.worker.js b/libantosdk/build/debug/core/backend.worker.js
similarity index 71%
rename from libantosdk/build/debug/core/linux.worker.js
rename to libantosdk/build/debug/core/backend.worker.js
index 41a0396..7d4b9ed 100644
--- a/libantosdk/build/debug/core/linux.worker.js
+++ b/libantosdk/build/debug/core/backend.worker.js
@@ -1,4 +1,4 @@
-class LinuxJob extends AntOSDKBaseJob {
+class BackendJob extends AntOSDKBaseJob {
     constructor(data)
     {
         super(data);
@@ -6,7 +6,7 @@ class LinuxJob extends AntOSDKBaseJob {
     execute()
     {
         switch (this.job.cmd) {
-            case 'linux-exec':
+            case 'cmd-exec':
                 /**
                  * Execute a linux command with the
                  * help of a server side lua API
@@ -14,6 +14,9 @@ class LinuxJob extends AntOSDKBaseJob {
                  */
                 this.exec();
                 break;
+            case 'lua-exec':
+                this.xlua(this.job.data.path, this.job.data.params);
+                break;
             default:
                 const err_msg = `Unkown job ${this.job.cmd}`;
                 this.log_error(err_msg);
@@ -24,6 +27,21 @@ class LinuxJob extends AntOSDKBaseJob {
     exec()
     {
         const path = "pkg://libantosdk/core/lua/api.lua".abspath(this.job.root);
+        if(!this.job.data.pwd)
+        {
+            this.job.data.pwd = this.job.root;
+        }
+        const params = {
+                action: "exec",
+                args: this.job.data
+            };
+        this.xlua(path, params);
+    }
+
+
+    
+    xlua(path, params)
+    {
         const url = API.REST.replace("http","ws") + "/system/apigateway?ws=1";
         try{
             const socket = new WebSocket(url);
@@ -37,17 +55,10 @@ class LinuxJob extends AntOSDKBaseJob {
                 this.result("Done");
             };
             socket.onopen = (e) => {
-                if(!this.job.data.pwd)
-                {
-                    this.job.data.pwd = this.job.root;
-                }
                 // send the command
                 const cmd = {
                     path: path,
-                    parameters: {
-                        action: "exec",
-                        args: this.job.data
-                    }
+                    parameters: params
                 };
                 socket.send(JSON.stringify(cmd));
             };
@@ -71,4 +82,7 @@ class LinuxJob extends AntOSDKBaseJob {
     }
 }
 
-API.jobhandle["linux-exec"] = LinuxJob;
\ No newline at end of file
+
+
+API.jobhandle["cmd-exec"] = BackendJob;
+API.jobhandle["lua-exec"] = BackendJob;
\ No newline at end of file
diff --git a/libantosdk/build/debug/package.json b/libantosdk/build/debug/package.json
index f59997d..828f9c1 100644
--- a/libantosdk/build/debug/package.json
+++ b/libantosdk/build/debug/package.json
@@ -7,7 +7,7 @@
         "author": "Xuan Sang LE",
         "email": "mrsang@iohub.dev"
     },
-    "version": "0.1.0-b",
+    "version": "0.1.1-b",
     "category": "Development",
     "iconclass": "fa fa-cog",
     "mimes": [
diff --git a/libantosdk/build/release/libantosdk.zip b/libantosdk/build/release/libantosdk.zip
index 2c7b0d81bcdf5253440c1ccb4d8d0843673b18cf..79ef70c174540b1347963c3fbdb0491b92306ce2 100644
GIT binary patch
delta 2461
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
EA7Ut{e*gdg

delta 2226
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
GQ~w2|3Yl*J

diff --git a/libantosdk/core/linux.worker.js b/libantosdk/core/backend.worker.js
similarity index 71%
rename from libantosdk/core/linux.worker.js
rename to libantosdk/core/backend.worker.js
index 41a0396..7d4b9ed 100644
--- a/libantosdk/core/linux.worker.js
+++ b/libantosdk/core/backend.worker.js
@@ -1,4 +1,4 @@
-class LinuxJob extends AntOSDKBaseJob {
+class BackendJob extends AntOSDKBaseJob {
     constructor(data)
     {
         super(data);
@@ -6,7 +6,7 @@ class LinuxJob extends AntOSDKBaseJob {
     execute()
     {
         switch (this.job.cmd) {
-            case 'linux-exec':
+            case 'cmd-exec':
                 /**
                  * Execute a linux command with the
                  * help of a server side lua API
@@ -14,6 +14,9 @@ class LinuxJob extends AntOSDKBaseJob {
                  */
                 this.exec();
                 break;
+            case 'lua-exec':
+                this.xlua(this.job.data.path, this.job.data.params);
+                break;
             default:
                 const err_msg = `Unkown job ${this.job.cmd}`;
                 this.log_error(err_msg);
@@ -24,6 +27,21 @@ class LinuxJob extends AntOSDKBaseJob {
     exec()
     {
         const path = "pkg://libantosdk/core/lua/api.lua".abspath(this.job.root);
+        if(!this.job.data.pwd)
+        {
+            this.job.data.pwd = this.job.root;
+        }
+        const params = {
+                action: "exec",
+                args: this.job.data
+            };
+        this.xlua(path, params);
+    }
+
+
+    
+    xlua(path, params)
+    {
         const url = API.REST.replace("http","ws") + "/system/apigateway?ws=1";
         try{
             const socket = new WebSocket(url);
@@ -37,17 +55,10 @@ class LinuxJob extends AntOSDKBaseJob {
                 this.result("Done");
             };
             socket.onopen = (e) => {
-                if(!this.job.data.pwd)
-                {
-                    this.job.data.pwd = this.job.root;
-                }
                 // send the command
                 const cmd = {
                     path: path,
-                    parameters: {
-                        action: "exec",
-                        args: this.job.data
-                    }
+                    parameters: params
                 };
                 socket.send(JSON.stringify(cmd));
             };
@@ -71,4 +82,7 @@ class LinuxJob extends AntOSDKBaseJob {
     }
 }
 
-API.jobhandle["linux-exec"] = LinuxJob;
\ No newline at end of file
+
+
+API.jobhandle["cmd-exec"] = BackendJob;
+API.jobhandle["lua-exec"] = BackendJob;
\ No newline at end of file
diff --git a/libantosdk/package.json b/libantosdk/package.json
index f59997d..828f9c1 100644
--- a/libantosdk/package.json
+++ b/libantosdk/package.json
@@ -7,7 +7,7 @@
         "author": "Xuan Sang LE",
         "email": "mrsang@iohub.dev"
     },
-    "version": "0.1.0-b",
+    "version": "0.1.1-b",
     "category": "Development",
     "iconclass": "fa fa-cog",
     "mimes": [
diff --git a/libantosdk/project.json b/libantosdk/project.json
deleted file mode 100644
index c9a38b7..0000000
--- a/libantosdk/project.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "name": "libantosdk",
-    "css": ["main.css"],
-    "javascripts": [],
-    "coffees": [],
-    "ts": ["ts/main.ts", "ts/app.ts"],
-    "copies": ["core","package.json","scheme.html", "README.md"]
-}
\ No newline at end of file