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 2d6568b..231996c 100644 Binary files a/Blogger/build/release/Blogger.zip and b/Blogger/build/release/Blogger.zip differ 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 2c7b0d8..79ef70c 100644 Binary files a/libantosdk/build/release/libantosdk.zip and b/libantosdk/build/release/libantosdk.zip differ 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