update vterm and Antunnel

This commit is contained in:
lxsang 2020-08-08 19:40:21 +02:00
parent 8b2c534e80
commit 328172ef90
11 changed files with 39 additions and 690 deletions

File diff suppressed because one or more lines are too long

View File

@ -9,7 +9,7 @@
"author": "Xuan Sang LE", "author": "Xuan Sang LE",
"email": "xsang.le@lxsang.me" "email": "xsang.le@lxsang.me"
}, },
"version":"0.1.1-a", "version":"0.1.2-a",
"category":"Library", "category":"Library",
"iconclass":"fa fa-adn", "iconclass":"fa fa-adn",
"mimes":["none"], "mimes":["none"],

Binary file not shown.

View File

@ -217,16 +217,17 @@ class AntunnelApi
@onclose() if @onclose() @onclose() if @onclose()
W = this W = this
W.Antunnel = { if not W.Antunnel
tunnel: undefined W.Antunnel = {
init: ((url) -> tunnel: undefined
return new Promise (resolve, reject) -> init: ((url) ->
return resolve(W.Antunnel.tunnel) if W.Antunnel.tunnel return new Promise (resolve, reject) ->
W.Antunnel.tunnel = new AntunnelApi(url) return resolve(W.Antunnel.tunnel) if W.Antunnel.tunnel
W.Antunnel.tunnel.onclose = () -> W.Antunnel.tunnel = undefined W.Antunnel.tunnel = new AntunnelApi(url)
W.Antunnel.tunnel.ready().then () -> W.Antunnel.tunnel.onclose = () -> W.Antunnel.tunnel = undefined
resolve(W.Antunnel.tunnel) W.Antunnel.tunnel.ready().then () ->
.catch (e) -> reject(e)), resolve(W.Antunnel.tunnel)
Subscriber: Subscriber, .catch (e) -> reject(e)),
Msg: Msg Subscriber: Subscriber,
} Msg: Msg
}

View File

@ -9,7 +9,7 @@
"author": "Xuan Sang LE", "author": "Xuan Sang LE",
"email": "xsang.le@lxsang.me" "email": "xsang.le@lxsang.me"
}, },
"version":"0.1.1-a", "version":"0.1.2-a",
"category":"Library", "category":"Library",
"iconclass":"fa fa-adn", "iconclass":"fa fa-adn",
"mimes":["none"], "mimes":["none"],

View File

@ -23,7 +23,7 @@
"description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/Antunnel/README.md", "description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/Antunnel/README.md",
"category": "Library", "category": "Library",
"author": "Xuan Sang LE", "author": "Xuan Sang LE",
"version": "0.1.1-a", "version": "0.1.2-a",
"download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/Antunnel/build/release/Antunnel.zip" "download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/Antunnel/build/release/Antunnel.zip"
}, },
{ {
@ -149,7 +149,7 @@
"description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/vTerm/README.md", "description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/vTerm/README.md",
"category": "System", "category": "System",
"author": "Xuan Sang LE", "author": "Xuan Sang LE",
"version": "0.0.5-a", "version": "0.1.2-a",
"download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/vTerm/build/release/vTerm.zip" "download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/vTerm/build/release/vTerm.zip"
}, },
{ {

File diff suppressed because one or more lines are too long

View File

@ -6,7 +6,7 @@
"author": "Xuan Sang LE", "author": "Xuan Sang LE",
"email": "xsang.le@gmail.com" "email": "xsang.le@gmail.com"
}, },
"version":"0.0.5-a", "version":"0.1.2-a",
"category":"System", "category":"System",
"iconclass":"fa fa-terminal", "iconclass":"fa fa-terminal",
"mimes":["none"], "mimes":["none"],

Binary file not shown.

View File

@ -51,15 +51,25 @@ class vTerm extends this.OS.application.BaseApplication
@on "hboxchange", (e) => @on "hboxchange", (e) =>
@resizeContent() @resizeContent()
if not Antunnel.tunnel checklib = () =>
@error __("The Antunnel service is not started, please start it first") if not Antunnel.tunnel
@_gui.pushService("Antunnel/AntunnelService") @error __("The Antunnel service is not started, please start it first")
@_gui.pushService("Antunnel/AntunnelService")
.catch (e) =>
@error e.toString(), e
@quit()
else
@tunnel = Antunnel.tunnel
@openSession()
if not Antunnel
@_api.requires("pkg://Antunnel/main.js").then () =>
checklib()
.catch (e) => .catch (e) =>
@error e.toString(), e @error __("Unable to load Antunnel: {0}",e.toString()), e
@quit() @quit()
else else
@tunnel = Antunnel.tunnel checklib()
@openSession()
mctxHandle: (data) -> mctxHandle: (data) ->
switch data.id switch data.id
@ -111,9 +121,4 @@ class vTerm extends this.OS.application.BaseApplication
cleanup: (e) -> cleanup: (e) ->
@sub.close() if @sub @sub.close() if @sub
vTerm.dependencies = [
"pkg://Antunnel/main.js"
]
this.OS.register "vTerm", vTerm this.OS.register "vTerm", vTerm

View File

@ -6,7 +6,7 @@
"author": "Xuan Sang LE", "author": "Xuan Sang LE",
"email": "xsang.le@gmail.com" "email": "xsang.le@gmail.com"
}, },
"version":"0.0.5-a", "version":"0.1.2-a",
"category":"System", "category":"System",
"iconclass":"fa fa-terminal", "iconclass":"fa fa-terminal",
"mimes":["none"], "mimes":["none"],