pinokiod 3.8.148 → 3.8.150
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/kernel/api/index.js +0 -10
- package/kernel/api/script/index.js +0 -2
- package/kernel/bin/caddy.js +6 -9
- package/kernel/bin/conda.js +4 -9
- package/kernel/bin/index.js +213 -81
- package/kernel/bin/setup.js +130 -0
- package/kernel/environment.js +50 -1
- package/kernel/index.js +15 -60
- package/kernel/info.js +0 -3
- package/kernel/kv.js +3 -0
- package/kernel/loader.js +3 -12
- package/kernel/peer.js +11 -16
- package/kernel/procs.js +1 -4
- package/kernel/prototype.js +12 -9
- package/kernel/router/common.js +31 -41
- package/kernel/router/connector.js +33 -64
- package/kernel/router/index.js +51 -124
- package/kernel/router/localhost_home_router.js +7 -18
- package/kernel/router/localhost_variable_router.js +0 -1
- package/kernel/router/peer_port_router.js +2 -3
- package/kernel/router/processor.js +0 -3
- package/kernel/shell.js +0 -23
- package/kernel/shells.js +0 -16
- package/package.json +1 -1
- package/server/index.js +145 -318
- package/server/public/fscreator.js +1 -1
- package/server/public/install.js +2 -2
- package/server/public/style.css +4 -0
- package/server/socket.js +0 -27
- package/server/views/bootstrap.ejs +6 -1
- package/server/views/download.ejs +7 -1
- package/server/views/editor.ejs +7 -3
- package/server/views/file_explorer.ejs +7 -1
- package/server/views/index.ejs +7 -1
- package/server/views/install.ejs +8 -5
- package/server/views/minterm.ejs +7 -3
- package/server/views/network.ejs +3 -1
- package/server/views/prototypes.ejs +1 -1
- package/server/views/setup.ejs +254 -0
- package/server/views/setup_home.ejs +181 -0
- package/server/views/terminal.ejs +7 -4
- package/kernel/caddy2.js +0 -666
- package/kernel/peer2.js +0 -83
- package/kernel/router/root.js +0 -54
- package/kernel/tree-kill.js +0 -167
package/server/index.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
const express = require('express');
|
|
2
|
-
//const kill = require('../kernel/tree-kill');
|
|
3
2
|
const kill = require('kill-sync')
|
|
4
3
|
const portfinder = require('portfinder-cp');
|
|
5
4
|
const proxy = require('express-http-proxy-cp');
|
|
@@ -47,6 +46,8 @@ const Environment = require("../kernel/environment")
|
|
|
47
46
|
const Cloudflare = require("../kernel/api/cloudflare")
|
|
48
47
|
const Util = require("../kernel/util")
|
|
49
48
|
|
|
49
|
+
const Setup = require("../kernel/bin/setup")
|
|
50
|
+
|
|
50
51
|
class Server {
|
|
51
52
|
constructor(config) {
|
|
52
53
|
this.tabs = {}
|
|
@@ -428,6 +429,21 @@ class Server {
|
|
|
428
429
|
rawpath,
|
|
429
430
|
})
|
|
430
431
|
}
|
|
432
|
+
getVariationUrls(req) {
|
|
433
|
+
let edu = new URL("http://localhost" + req.originalUrl)
|
|
434
|
+
edu.searchParams.set("mode", "source")
|
|
435
|
+
let editorUrl = edu.pathname + edu.search
|
|
436
|
+
|
|
437
|
+
let referer = req.get("Referer")
|
|
438
|
+
let prevUrl = null
|
|
439
|
+
try {
|
|
440
|
+
if (/\/env\/api\/.+/.test(new URL(referer).pathname)) {
|
|
441
|
+
prevUrl = referer
|
|
442
|
+
}
|
|
443
|
+
} catch (e) {
|
|
444
|
+
}
|
|
445
|
+
return { editorUrl, prevUrl }
|
|
446
|
+
}
|
|
431
447
|
async render(req, res, pathComponents, meta) {
|
|
432
448
|
|
|
433
449
|
|
|
@@ -556,8 +572,9 @@ class Server {
|
|
|
556
572
|
display: ["form"]
|
|
557
573
|
})
|
|
558
574
|
} else if (pathComponents.length === 0 && req.query.mode === "download") {
|
|
559
|
-
let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.
|
|
560
|
-
|
|
575
|
+
let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
|
|
576
|
+
bin: this.kernel.bin.preset("ai"),
|
|
577
|
+
})
|
|
561
578
|
res.render("download", {
|
|
562
579
|
error,
|
|
563
580
|
current: req.originalUrl,
|
|
@@ -762,240 +779,57 @@ class Server {
|
|
|
762
779
|
resolved = runner
|
|
763
780
|
}
|
|
764
781
|
|
|
765
|
-
let template
|
|
766
|
-
template = "terminal"
|
|
767
|
-
|
|
782
|
+
let template = "terminal"
|
|
768
783
|
if (req.query && req.query.mode === "source") {
|
|
769
784
|
template = "editor"
|
|
770
785
|
}
|
|
771
786
|
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
|
|
775
|
-
// if (req.query && req.query.fullscreen) {
|
|
776
|
-
// template = "fullscreen_editor"
|
|
777
|
-
// } else {
|
|
778
|
-
// template = "editor"
|
|
779
|
-
// }
|
|
780
|
-
// } else if (schemaPath && schemaPath.length > 0) {
|
|
781
|
-
// template = "form"
|
|
782
|
-
// } else {
|
|
783
|
-
// if (req.query && req.query.fullscreen) {
|
|
784
|
-
// template = "fullscreen_editor"
|
|
785
|
-
// } else {
|
|
786
|
-
// template = "editor"
|
|
787
|
-
// }
|
|
788
|
-
// }
|
|
789
|
-
|
|
790
|
-
|
|
791
|
-
let requirements = [{
|
|
792
|
-
name: "conda",
|
|
793
|
-
}, {
|
|
794
|
-
name: "git",
|
|
795
|
-
}, {
|
|
796
|
-
name: "zip",
|
|
797
|
-
}, {
|
|
798
|
-
name: "node",
|
|
799
|
-
}, {
|
|
800
|
-
name: "ffmpeg",
|
|
801
|
-
}, {
|
|
802
|
-
name: "caddy",
|
|
803
|
-
// type: "conda",
|
|
804
|
-
// name: "ffmpeg",
|
|
805
|
-
// args: "-c conda-forge"
|
|
806
|
-
}]
|
|
807
|
-
let platform = os.platform()
|
|
808
|
-
if (platform === "win32") {
|
|
809
|
-
requirements.push({
|
|
810
|
-
name: "registry"
|
|
811
|
-
})
|
|
812
|
-
requirements.push({
|
|
813
|
-
name: "vs"
|
|
814
|
-
})
|
|
815
|
-
}
|
|
816
|
-
if (platform === "darwin") {
|
|
817
|
-
requirements.push({
|
|
818
|
-
name: "brew"
|
|
819
|
-
})
|
|
820
|
-
}
|
|
821
|
-
if (platform === "linux") {
|
|
822
|
-
requirements.push({
|
|
823
|
-
name: "gxx"
|
|
824
|
-
})
|
|
825
|
-
}
|
|
826
|
-
if (this.kernel.gpu === "nvidia") {
|
|
827
|
-
requirements.push({
|
|
828
|
-
name: "cuda"
|
|
829
|
-
})
|
|
830
|
-
}
|
|
831
|
-
requirements = requirements.concat([{
|
|
832
|
-
name: "cloudflared"
|
|
833
|
-
// }, {
|
|
834
|
-
// name: "playwright"
|
|
835
|
-
}, {
|
|
836
|
-
name: "huggingface"
|
|
837
|
-
}, {
|
|
838
|
-
name: "uv"
|
|
839
|
-
}, {
|
|
840
|
-
name: "py"
|
|
841
|
-
}])
|
|
842
|
-
// if (platform === "linux") {
|
|
843
|
-
// requirements.push({
|
|
844
|
-
// name: "brew"
|
|
845
|
-
// })
|
|
846
|
-
// }
|
|
847
|
-
|
|
848
|
-
if (resolved && resolved.requires && resolved.requires.length > 0) {
|
|
849
|
-
/*********************************************************************
|
|
850
|
-
|
|
851
|
-
syntax :=
|
|
852
|
-
|
|
853
|
-
{
|
|
854
|
-
platform: <win32|darwin|linux>,
|
|
855
|
-
type: <conda|pip|brew|none>,
|
|
856
|
-
name: <package name>, (example: "ffmpeg", "git")
|
|
857
|
-
args: <install command flags> (example: "-c conda-forge")
|
|
858
|
-
}
|
|
859
|
-
|
|
860
|
-
|
|
861
|
-
1. pinokio native install: no need for specifying platforms since they are included
|
|
862
|
-
|
|
863
|
-
{
|
|
864
|
-
name: "conda"
|
|
865
|
-
}
|
|
866
|
-
|
|
867
|
-
|
|
868
|
-
2. non native install (conda, pip, brew)
|
|
869
|
-
|
|
870
|
-
2.1. Same on all platforms
|
|
871
|
-
|
|
872
|
-
[{
|
|
873
|
-
type: "conda",
|
|
874
|
-
name: "ffmpeg",
|
|
875
|
-
args: "-c conda-forge"
|
|
876
|
-
}]
|
|
877
|
-
|
|
878
|
-
2.2. Specify per platform
|
|
879
|
-
|
|
880
|
-
|
|
881
|
-
[
|
|
882
|
-
{ name: "conda" },
|
|
883
|
-
{ platform: "darwin", type: "brew", name: "llvm" },
|
|
884
|
-
{ platform: "linux", tyoe: "conda", name: "llvm", args: "-c conda-forge llvm" },
|
|
885
|
-
{ platform: "win32", tyoe: "conda", name: "llvm", args: "-c conda-forge llvm" }
|
|
886
|
-
]
|
|
887
|
-
|
|
888
|
-
[
|
|
889
|
-
{ name: "conda" },
|
|
890
|
-
{ platform: ["darwin", "linux"], type: "brew", name: "llvm" },
|
|
891
|
-
{ platform: "win32", tyoe: "conda", name: "llvm", args: "-c conda-forge llvm" }
|
|
892
|
-
]
|
|
893
|
-
|
|
894
|
-
|
|
895
|
-
|
|
896
|
-
*********************************************************************/
|
|
897
|
-
|
|
898
|
-
|
|
899
|
-
let platform = os.platform()
|
|
900
|
-
let type_name_set = new Set()
|
|
901
|
-
for(let r of resolved.requires) {
|
|
902
|
-
// if no platform specified, or if the specified platform matches the current platform
|
|
903
|
-
if (!r.platform || platform === r.platform || Array.isArray(r.platform) && r.platform.includes(platform) ) {
|
|
904
|
-
if (Array.isArray(r.name)) {
|
|
905
|
-
// if array, just add it
|
|
906
|
-
requirements.push(r)
|
|
907
|
-
} else {
|
|
908
|
-
let type_name = `${r.type ? r.type : ''}/${r.name}`
|
|
909
|
-
if (!type_name_set.has(type_name)) {
|
|
910
|
-
type_name_set.add(type_name)
|
|
911
|
-
requirements.push(r)
|
|
912
|
-
}
|
|
913
|
-
}
|
|
914
|
-
}
|
|
915
|
-
}
|
|
916
|
-
|
|
917
|
-
}
|
|
918
|
-
let requirements_pending = !this.kernel.bin.installed_initialized
|
|
919
|
-
|
|
920
|
-
let install_required = true
|
|
921
|
-
if (!requirements_pending) {
|
|
922
|
-
install_required = false
|
|
923
|
-
for(let i=0; i<requirements.length; i++) {
|
|
924
|
-
let r = requirements[i]
|
|
925
|
-
|
|
926
|
-
let relevant = this.relevant(r)
|
|
927
|
-
requirements[i].relevant = relevant
|
|
928
|
-
if (relevant) {
|
|
929
|
-
let installed = await this.installed(r)
|
|
930
|
-
requirements[i].installed = installed
|
|
931
|
-
if (!installed) {
|
|
932
|
-
install_required = true
|
|
933
|
-
}
|
|
934
|
-
}
|
|
935
|
-
}
|
|
936
|
-
}
|
|
937
|
-
|
|
938
|
-
let error = null
|
|
939
|
-
try {
|
|
940
|
-
this.kernel.bin.compatible()
|
|
941
|
-
} catch (e) {
|
|
942
|
-
error = e.message
|
|
943
|
-
install_required = true
|
|
944
|
-
}
|
|
945
|
-
|
|
946
|
-
requirements = requirements.filter((r) => {
|
|
947
|
-
return r.relevant
|
|
787
|
+
let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
|
|
788
|
+
bin: this.kernel.bin.preset("ai"),
|
|
789
|
+
script: resolved
|
|
948
790
|
})
|
|
949
791
|
|
|
792
|
+
//let requirements = this.kernel.bin.requirements(resolved)
|
|
793
|
+
//let requirements_pending = !this.kernel.bin.installed_initialized
|
|
794
|
+
//let install_required = true
|
|
795
|
+
//if (!requirements_pending) {
|
|
796
|
+
// install_required = false
|
|
797
|
+
// for(let i=0; i<requirements.length; i++) {
|
|
798
|
+
// let r = requirements[i]
|
|
799
|
+
|
|
800
|
+
// let relevant = this.relevant(r)
|
|
801
|
+
// requirements[i].relevant = relevant
|
|
802
|
+
// if (relevant) {
|
|
803
|
+
// let installed = await this.installed(r)
|
|
804
|
+
// requirements[i].installed = installed
|
|
805
|
+
// if (!installed) {
|
|
806
|
+
// install_required = true
|
|
807
|
+
// }
|
|
808
|
+
// }
|
|
809
|
+
// }
|
|
810
|
+
//}
|
|
950
811
|
|
|
951
|
-
let
|
|
952
|
-
|
|
953
|
-
|
|
954
|
-
|
|
812
|
+
//let error = null
|
|
813
|
+
//try {
|
|
814
|
+
// this.kernel.bin.compatible()
|
|
815
|
+
//} catch (e) {
|
|
816
|
+
// error = e.message
|
|
817
|
+
// install_required = true
|
|
818
|
+
//}
|
|
955
819
|
|
|
956
|
-
|
|
820
|
+
//requirements = requirements.filter((r) => {
|
|
821
|
+
// return r.relevant
|
|
822
|
+
//})
|
|
957
823
|
|
|
958
|
-
let prev = null
|
|
959
|
-
try {
|
|
960
|
-
if (/\/env\/api\/.+/.test(new URL(referer).pathname)) {
|
|
961
|
-
prev = referer
|
|
962
|
-
}
|
|
963
|
-
} catch (e) {
|
|
964
|
-
}
|
|
965
824
|
|
|
825
|
+
let mem = this.getMemory(filepath)
|
|
966
826
|
|
|
967
|
-
let
|
|
968
|
-
let pre_items = []
|
|
969
|
-
if (resolved && resolved.pre) {
|
|
970
|
-
let env = await Environment.get2(filepath, this.kernel)
|
|
971
|
-
for(let item of resolved.pre) {
|
|
972
|
-
if (item.env) {
|
|
827
|
+
let { editorUrl, prevUrl } = this.getVariationUrls(req)
|
|
973
828
|
|
|
974
|
-
if (!item.index) {
|
|
975
|
-
item.index = 0
|
|
976
|
-
}
|
|
977
|
-
if (item.key) {
|
|
978
|
-
const hasProtocol = /^[a-zA-Z][a-zA-Z\d+\-.]*:\/\//.test(item.key);
|
|
979
|
-
const url = new URL(hasProtocol ? item.key : `https://${item.key}`);
|
|
980
|
-
item.host = url.host
|
|
981
|
-
item.val = await this.kernel.kv.get(item.host, item.index)
|
|
982
|
-
} else {
|
|
983
|
-
item.host = ""
|
|
984
|
-
}
|
|
985
829
|
|
|
986
|
-
|
|
987
|
-
|
|
988
|
-
|
|
989
|
-
if (item.default) {
|
|
990
|
-
item.val = item.default
|
|
991
|
-
}
|
|
992
|
-
requires_instantiation = true
|
|
993
|
-
}
|
|
994
|
-
pre_items.push(item)
|
|
995
|
-
}
|
|
996
|
-
}
|
|
997
|
-
}
|
|
998
|
-
if (requires_instantiation) {
|
|
830
|
+
let env_requirements = await Environment.requirements(resolved, filepath, this.kernel)
|
|
831
|
+
console.log({ env_requirements })
|
|
832
|
+
if (env_requirements.requires_instantiation) {
|
|
999
833
|
let p = Util.api_path(filepath, this.kernel)
|
|
1000
834
|
let platform = os.platform()
|
|
1001
835
|
if (platform === "win32") {
|
|
@@ -1006,12 +840,12 @@ class Server {
|
|
|
1006
840
|
theme: this.theme,
|
|
1007
841
|
filename,
|
|
1008
842
|
filepath: p,
|
|
1009
|
-
items:
|
|
843
|
+
items: env_requirements.items
|
|
1010
844
|
})
|
|
1011
845
|
} else {
|
|
1012
846
|
let logpath = encodeURIComponent(Util.log_path(filepath, this.kernel))
|
|
1013
847
|
const result = {
|
|
1014
|
-
prev,
|
|
848
|
+
prev: prevUrl,
|
|
1015
849
|
error,
|
|
1016
850
|
memory: mem,
|
|
1017
851
|
// memory: mem,
|
|
@@ -1762,89 +1596,6 @@ class Server {
|
|
|
1762
1596
|
return config
|
|
1763
1597
|
}
|
|
1764
1598
|
}
|
|
1765
|
-
relevant(r) {
|
|
1766
|
-
/*
|
|
1767
|
-
single platform
|
|
1768
|
-
[
|
|
1769
|
-
{ name: "conda" },
|
|
1770
|
-
{ platform: "darwin", type: "brew", name: "llvm" },
|
|
1771
|
-
{ platform: "linux", tyoe: "conda", name: "llvm", args: "-c conda-forge llvm" },
|
|
1772
|
-
{ platform: "win32", tyoe: "conda", name: "llvm", args: "-c conda-forge llvm" }
|
|
1773
|
-
]
|
|
1774
|
-
|
|
1775
|
-
multiple platforms
|
|
1776
|
-
[
|
|
1777
|
-
{ name: "conda" },
|
|
1778
|
-
{ platform: ["darwin", "linux"], type: "brew", name: "llvm" },
|
|
1779
|
-
{ platform: "win32", tyoe: "conda", name: "llvm", args: "-c conda-forge llvm" }
|
|
1780
|
-
]
|
|
1781
|
-
|
|
1782
|
-
|
|
1783
|
-
platform & arch
|
|
1784
|
-
[
|
|
1785
|
-
{ name: "conda" },
|
|
1786
|
-
{ platform: "darwin", arch: ["arm64", "x64"], type: "brew", name: "llvm" },
|
|
1787
|
-
]
|
|
1788
|
-
*/
|
|
1789
|
-
|
|
1790
|
-
let platform = os.platform()
|
|
1791
|
-
let arch = os.arch()
|
|
1792
|
-
let gpu = this.kernel.gpu
|
|
1793
|
-
let relevant = {
|
|
1794
|
-
platform: false,
|
|
1795
|
-
arch: false,
|
|
1796
|
-
gpu: false,
|
|
1797
|
-
}
|
|
1798
|
-
if (r.platform) {
|
|
1799
|
-
if (Array.isArray(r.platform)) {
|
|
1800
|
-
// multiple items
|
|
1801
|
-
if (r.platform.includes(platform)) {
|
|
1802
|
-
relevant.platform = true
|
|
1803
|
-
}
|
|
1804
|
-
} else {
|
|
1805
|
-
// one item
|
|
1806
|
-
if (r.platform === platform) {
|
|
1807
|
-
relevant.platform = true
|
|
1808
|
-
}
|
|
1809
|
-
}
|
|
1810
|
-
} else {
|
|
1811
|
-
// all platforms
|
|
1812
|
-
relevant.platform = true
|
|
1813
|
-
}
|
|
1814
|
-
if (r.arch) {
|
|
1815
|
-
if (Array.isArray(r.arch)) {
|
|
1816
|
-
// multiple items
|
|
1817
|
-
if (r.arch.includes(arch)) {
|
|
1818
|
-
relevant.arch = true
|
|
1819
|
-
}
|
|
1820
|
-
} else {
|
|
1821
|
-
// one item
|
|
1822
|
-
if (r.arch === arch) {
|
|
1823
|
-
relevant.arch = true
|
|
1824
|
-
}
|
|
1825
|
-
}
|
|
1826
|
-
} else {
|
|
1827
|
-
// all platforms
|
|
1828
|
-
relevant.arch = true
|
|
1829
|
-
}
|
|
1830
|
-
if (r.gpu) {
|
|
1831
|
-
if (Array.isArray(r.gpu)) {
|
|
1832
|
-
// multiple items
|
|
1833
|
-
if (r.gpu.includes(gpu)) {
|
|
1834
|
-
relevant.gpu = true
|
|
1835
|
-
}
|
|
1836
|
-
} else {
|
|
1837
|
-
// one item
|
|
1838
|
-
if (r.gpu === gpu) {
|
|
1839
|
-
relevant.gpu = true
|
|
1840
|
-
}
|
|
1841
|
-
}
|
|
1842
|
-
} else {
|
|
1843
|
-
// all platforms
|
|
1844
|
-
relevant.gpu = true
|
|
1845
|
-
}
|
|
1846
|
-
return relevant.platform && relevant.arch && relevant.gpu
|
|
1847
|
-
}
|
|
1848
1599
|
async _installed(name, type) {
|
|
1849
1600
|
if (type === "conda") {
|
|
1850
1601
|
return this.kernel.bin.installed.conda.has(name)
|
|
@@ -2470,6 +2221,15 @@ class Server {
|
|
|
2470
2221
|
//let home = this.kernel.homedir
|
|
2471
2222
|
//let home = this.kernel.store.get("home")
|
|
2472
2223
|
this.app.get("/", ex(async (req, res) => {
|
|
2224
|
+
// check bin folder
|
|
2225
|
+
let bin_path = this.kernel.path("bin/miniconda")
|
|
2226
|
+
let bin_exists = await this.exists(bin_path)
|
|
2227
|
+
if (!bin_exists) {
|
|
2228
|
+
res.redirect("/setup")
|
|
2229
|
+
return
|
|
2230
|
+
}
|
|
2231
|
+
|
|
2232
|
+
|
|
2473
2233
|
if (req.query.mode !== "settings" && !home) {
|
|
2474
2234
|
res.redirect("/?mode=settings")
|
|
2475
2235
|
return
|
|
@@ -2717,7 +2477,66 @@ class Server {
|
|
|
2717
2477
|
}
|
|
2718
2478
|
}
|
|
2719
2479
|
}))
|
|
2480
|
+
this.app.get("/setup", ex(async (req, res) => {
|
|
2481
|
+
let items = []
|
|
2482
|
+
for(let id in Setup) {
|
|
2483
|
+
let item = Setup[id](this.kernel)
|
|
2484
|
+
items.push({
|
|
2485
|
+
id,
|
|
2486
|
+
...item
|
|
2487
|
+
})
|
|
2488
|
+
}
|
|
2489
|
+
res.render("setup_home", {
|
|
2490
|
+
items,
|
|
2491
|
+
logo: this.logo,
|
|
2492
|
+
theme: this.theme,
|
|
2493
|
+
agent: this.agent,
|
|
2494
|
+
})
|
|
2495
|
+
}))
|
|
2496
|
+
this.app.get("/setup/:mode", ex(async (req, res) => {
|
|
2497
|
+
/*
|
|
2498
|
+
1. mode:ai => all
|
|
2499
|
+
2. mode:coding => conda, nodejs, git
|
|
2500
|
+
3. mode:network => conda, git, caddy
|
|
2501
|
+
4. mode:
|
|
2502
|
+
*/
|
|
2503
|
+
|
|
2504
|
+
let bin = this.kernel.bin.preset(req.params.mode)
|
|
2505
|
+
|
|
2506
|
+
let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
|
|
2507
|
+
bin
|
|
2508
|
+
})
|
|
2509
|
+
// set dependencies for conda
|
|
2510
|
+
for(let i=0; i<requirements.length; i++) {
|
|
2511
|
+
let r = requirements[i]
|
|
2512
|
+
if (r.name === "conda") {
|
|
2513
|
+
requirements[i].dependencies = bin.conda_requirements
|
|
2514
|
+
}
|
|
2515
|
+
}
|
|
2516
|
+
console.log("RE", JSON.stringify(requirements, null, 2))
|
|
2517
|
+
let current = req.query.callback || req.originalUrl
|
|
2518
|
+
res.render("setup", {
|
|
2519
|
+
error,
|
|
2520
|
+
current,
|
|
2521
|
+
install_required,
|
|
2522
|
+
requirements,
|
|
2523
|
+
requirements_pending,
|
|
2524
|
+
logo: this.logo,
|
|
2525
|
+
theme: this.theme,
|
|
2526
|
+
agent: this.agent,
|
|
2527
|
+
})
|
|
2528
|
+
}))
|
|
2720
2529
|
this.app.get("/network", ex(async (req, res) => {
|
|
2530
|
+
let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
|
|
2531
|
+
bin: this.kernel.bin.preset("network"),
|
|
2532
|
+
})
|
|
2533
|
+
console.log({ requirements, install_required, requirements_pending })
|
|
2534
|
+
|
|
2535
|
+
if (install_required) {
|
|
2536
|
+
res.redirect("/setup/network?callback=/network")
|
|
2537
|
+
return
|
|
2538
|
+
}
|
|
2539
|
+
|
|
2721
2540
|
let list = this.getPeerInfo()
|
|
2722
2541
|
|
|
2723
2542
|
|
|
@@ -3603,11 +3422,11 @@ class Server {
|
|
|
3603
3422
|
}
|
|
3604
3423
|
res.redirect(webpath)
|
|
3605
3424
|
}))
|
|
3606
|
-
this.app.get("/pinokio/
|
|
3607
|
-
let
|
|
3608
|
-
res.json(
|
|
3425
|
+
this.app.get("/pinokio/prototype/*", ex(async (req, res) => {
|
|
3426
|
+
let id = req.params[0]
|
|
3427
|
+
res.json(this.kernel.proto.kv[id])
|
|
3609
3428
|
}))
|
|
3610
|
-
this.app.post("/pinokio/
|
|
3429
|
+
this.app.post("/pinokio/prototype", this.upload.any(), ex(async (req, res) => {
|
|
3611
3430
|
try {
|
|
3612
3431
|
/*
|
|
3613
3432
|
{
|
|
@@ -3625,7 +3444,7 @@ class Server {
|
|
|
3625
3444
|
console.log({ formData })
|
|
3626
3445
|
// 1. instantiate based on id
|
|
3627
3446
|
let script = this.kernel.proto.kv[formData.id]
|
|
3628
|
-
await script.
|
|
3447
|
+
await script.create(this.kernel, formData)
|
|
3629
3448
|
// 2. create pinokio_meta.json
|
|
3630
3449
|
await this.createMeta(formData)
|
|
3631
3450
|
res.json({ success: true })
|
|
@@ -3908,7 +3727,6 @@ class Server {
|
|
|
3908
3727
|
|
|
3909
3728
|
}))
|
|
3910
3729
|
this.app.get("/pinokio/requirements_ready", ex((req, res) => {
|
|
3911
|
-
|
|
3912
3730
|
let requirements_pending = !this.kernel.bin.installed_initialized
|
|
3913
3731
|
console.log({ requirements_pending })
|
|
3914
3732
|
res.json({ requirements_pending })
|
|
@@ -3983,7 +3801,6 @@ class Server {
|
|
|
3983
3801
|
})
|
|
3984
3802
|
});
|
|
3985
3803
|
process.on('SIGINT', () => {
|
|
3986
|
-
console.log("[SigInt event] Kill", process.pid)
|
|
3987
3804
|
//if (this.kernel && this.kernel.shell) {
|
|
3988
3805
|
// console.log("shell reset")
|
|
3989
3806
|
// this.kernel.shell.reset(() => {
|
|
@@ -3992,7 +3809,12 @@ class Server {
|
|
|
3992
3809
|
//} else {
|
|
3993
3810
|
// process.exit()
|
|
3994
3811
|
//}
|
|
3995
|
-
|
|
3812
|
+
console.log("[SigInt event] Kill", process.pid)
|
|
3813
|
+
if (this.kernel.processes.caddy_pid) {
|
|
3814
|
+
console.log("kill caddy", this.kernel.processes.caddy_pid)
|
|
3815
|
+
kill(this.kernel.processes.caddy_pid, "SIGKILL", true)
|
|
3816
|
+
}
|
|
3817
|
+
console.log("kill self")
|
|
3996
3818
|
kill(process.pid, 'SIGKILL', true)
|
|
3997
3819
|
//kill(process.pid, map, 'SIGKILL', () => {
|
|
3998
3820
|
// console.log("child procs killed for", process.pid)
|
|
@@ -4001,7 +3823,6 @@ class Server {
|
|
|
4001
3823
|
})
|
|
4002
3824
|
|
|
4003
3825
|
process.on('SIGTERM', () => {
|
|
4004
|
-
console.log("[Sigterm event] Kill", process.pid)
|
|
4005
3826
|
// if (this.kernel && this.kernel.shell) {
|
|
4006
3827
|
// console.log("shell reset")
|
|
4007
3828
|
// this.kernel.shell.reset(() => {
|
|
@@ -4010,6 +3831,12 @@ class Server {
|
|
|
4010
3831
|
// } else {
|
|
4011
3832
|
// process.exit()
|
|
4012
3833
|
// }
|
|
3834
|
+
console.log("[Sigterm event] Kill", process.pid)
|
|
3835
|
+
if (this.kernel.processes.caddy_pid) {
|
|
3836
|
+
console.log("kill caddy", this.kernel.processes.caddy_pid)
|
|
3837
|
+
kill(this.kernel.processes.caddy_pid, "SIGKILL", true)
|
|
3838
|
+
}
|
|
3839
|
+
console.log("kill self")
|
|
4013
3840
|
kill(process.pid, 'SIGKILL', true)
|
|
4014
3841
|
//let map = this.kernel.processes.map || {}
|
|
4015
3842
|
//kill(process.pid, map, 'SIGKILL', () => {
|
|
@@ -99,7 +99,7 @@ const FSCreator = async (config) => {
|
|
|
99
99
|
instantUpload: false,
|
|
100
100
|
server: {
|
|
101
101
|
process: {
|
|
102
|
-
url: '/pinokio/
|
|
102
|
+
url: '/pinokio/prototype', // optional if same as above
|
|
103
103
|
ondata: (formData) => {
|
|
104
104
|
// set custom input fields
|
|
105
105
|
if (config.input) {
|
package/server/public/install.js
CHANGED
|
@@ -109,8 +109,8 @@ const install = async (name, url, term, socket, options) => {
|
|
|
109
109
|
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
|
-
const createTerm = async () => {
|
|
113
|
-
const theme = Object.assign({ },
|
|
112
|
+
const createTerm = async (_theme) => {
|
|
113
|
+
const theme = Object.assign({ }, _theme, {
|
|
114
114
|
selectionBackground: "red",
|
|
115
115
|
selectionForeground: "white"
|
|
116
116
|
})
|
package/server/public/style.css
CHANGED
|
@@ -111,7 +111,9 @@ body.dark .type-tabs {
|
|
|
111
111
|
}
|
|
112
112
|
.navheader2 {
|
|
113
113
|
padding: 15px 10px;
|
|
114
|
+
/*
|
|
114
115
|
background: white;
|
|
116
|
+
*/
|
|
115
117
|
}
|
|
116
118
|
.navheader {
|
|
117
119
|
backdrop-filter: blur(16px);
|
|
@@ -632,7 +634,9 @@ body.columns .containers {
|
|
|
632
634
|
}
|
|
633
635
|
.terminal-container {
|
|
634
636
|
padding: 10px 0;
|
|
637
|
+
/*
|
|
635
638
|
background: white;
|
|
639
|
+
*/
|
|
636
640
|
flex-grow: 1;
|
|
637
641
|
position: relative;
|
|
638
642
|
/*
|