software/theia: integrate theia open

+minor cleanups user section was not used

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = 1e843b325e5578a7344e00db5168d4ba
+md5sum = f95354d4af4a78ad7fd11ebc9281ed19
 
 [yarn.lock]
 filename = yarn.lock
@@ -23,4 +23,4 @@ md5sum = 07835b4acfbd8f4a96ac15ffecd238b0
 
 [python-language-server-requirements.txt]
 filename = python-language-server-requirements.txt
-md5sum = 2a296cba4c36d7a5fca5f4347a8c8469
+md5sum = d2ce161244ce9ebce5295302a1b2a7df

software/theia/instance.cfg.in

@@ -180,23 +180,39 @@ template =
   }
 
 
-
-[user]
-recipe = slapos.cookbook:userinfo
+[theia-service]
+recipe = slapos.recipe.template:jinja2
+rendered = $${directory:bin}/$${:_buildout_section_name_}
+mode = 0700
+template =
+  inline:#!/bin/sh
+  {% raw %}
+  export THEIA_WEBVIEW_EXTERNAL_ENDPOINT='{{hostname}}'
+  {% endraw %}
+  export THEIA_OPEN_EDITOR_TOKEN=$(${openssl:location}/bin/openssl rand -hex 32)
+  export THEIA_URL=$${:base-url}
+  export THEIA_SHELL=$${theia-shell:rendered}
+  export HOME=$${buildout:directory}
+  export TMP=$${directory:tmp}
+  export TEMP=$TMP
+  export LC_ALL=C.UTF-8
+  export EDITOR="${python-language-server:location}/bin/python -m theia_open --wait"
+  exec ${theia-wrapper:rendered} $@
+ip =  $${instance-parameter:ipv4-random}
+port = 3000
+base-url = http://$${:ip}:$${:port}/
 
 [theia-instance]
 recipe = slapos.cookbook:wrapper
 wrapper-path = $${directory:services}/$${:_buildout_section_name_}
-command-line =
-  env HOME=$${buildout:directory} LC_ALL=C.UTF-8 TMP=$${directory:tmp} THEIA_WEBVIEW_EXTERNAL_ENDPOINT='{{hostname}}' THEIA_SHELL=$${theia-shell:rendered} ${theia-wrapper:rendered} --hostname=$${:hostname} --port=$${:port} $${directory:project}
-
-ip =  $${instance-parameter:ipv4-random}
-hostname =  $${:ip}
-port = 3000
-base-url = http://$${:hostname}:$${:port}/
+command-line = $${theia-service:rendered}  --hostname=$${:hostname} --port=$${:port} $${directory:project}
 hash-existing-files =
   ${yarn.lock:output}
   ${theia-wrapper:rendered}
+ip =  $${instance-parameter:ipv4-random}
+hostname =  $${:ip}
+port = $${theia-service:port}
+base-url = $${theia-service:base-url}
 
 [theia-shell]
 recipe = slapos.recipe.template:jinja2
@@ -211,7 +227,6 @@ template = inline:
   if not args: args = ["-c", ". $${slapos-standalone-activate:rendered} && exec env GIT_EXEC_PATH= ${bash:location}/bin/bash", ]
   os.execv('${bash:location}/bin/bash', ['${bash:location}/bin/bash']  + args)
 
-
 [slapos-standalone-activate]
 recipe = slapos.recipe.template:jinja2
 rendered = $${directory:bin}/$${:_buildout_section_name_}
@@ -249,7 +264,7 @@ instance-promises =
 <= monitor-promise-base
 module = check_port_listening
 name = $${:_buildout_section_name_}.py
-config-hostname=  $${theia-instance:ip}
+config-hostname = $${theia-instance:ip}
 config-port = $${theia-instance:port}
 
 [frontend-listen-promise]

software/theia/python-language-server-requirements.txt

@@ -27,3 +27,4 @@ typing-extensions==3.7.4.2
 wrapt==1.11.2
 yapf==0.29.0
 zc.buildout.languageserver==0.2.1
+theia-open==0.1.2

software/theia/software.cfg

@@ -230,6 +230,7 @@ template =
           "@theia/variable-resolver": "latest",
           "@theia/vsx-registry": "latest",
           "@theia/workspace": "latest",
+          "@perrinjerome/theia-open": "0.1.2"
       },
       "devDependencies": {
           "@theia/cli": "latest"