cd87f39 · hypergodot · pear-git-v3

Changed files (15) +171 -55

hyper-gateway/hyper-gateway-linux +0 -0

(no content changes — binary or rename)

hyper-gateway/hyper-gateway-macos +0 -0

(no content changes — binary or rename)

hyper-gateway/hyper-gateway-windows.exe +0 -0

(no content changes — binary or rename)

src/HTTPEventSource.gd +1 -4

…	…	@@ -5,8 +5,6 @@ class_name HTTPEventSource
5	5	const URLParser = preload('./utils/URLParser.gd')
6	6
7	7	signal event(data, event, id)
8		signal response_started(status, headers)
9		signal response_finished()
10	8
11	9	var http = HTTPClient.new()
12	10	var urlParser = URLParser.new()
…	…	@@ -47,8 +45,7 @@ func request(
47	45	pass
48	46
49	47	func _runRequest(params):
50		var err = 0
51		http.connect_to_host(params.host, params.port, params.use_ssl, params.verify_host)
	48	var err = http.connect_to_host(params.host, params.port, params.use_ssl, params.verify_host)
52	49
53	50	print('Connected to host')
54	51

src/HyperChat/HyperChat.gd +6 -6

…	…	@@ -35,7 +35,7 @@ onready var listPeersRequest = $HyperGateway/ListPeersRequest
35	35	func _ready():
36	36	# Initialize random number generator
37	37	randomize()
38		gateway.ensureSetup()
	38	gateway.start()
39	39
40	40	func display_item(from, content):
41	41	# Add to item list
…	…	@@ -47,7 +47,7 @@ func send_current():
47	47	display_item(get_username(), text)
48	48	broadcast_text(text)
49	49
50		func update_identity(from, username):
	50	func update_identity(_from, username):
51	51	# Have some sort of sidebar to display known users?
52	52	display_item('System', 'Seen user ' + username)
53	53	pass
…	…	@@ -55,11 +55,11 @@ func update_identity(from, username):
55	55	func list_peers():
56	56	listPeersRequest.request(extensionPath)
57	57
58		func _on_text_message(data, from):
	58	func _on_text_message(data, _from):
59	59	# TODO: Something fancy with the `from` attribute?
60	60	display_item(data.username, data.content)
61	61
62		func _on_identity_message(data, from):
	62	func _on_identity_message(_data, from):
63	63	var isNew = !has_seen_identity(from)
64	64
65	65	# Track identity
…	…	@@ -127,7 +127,7 @@ func handle_message(message, from):
127	127	_:
128	128	_on_unknown_message(message, finalFrom)
129	129
130		func _on_event(data, event, id):
	130	func _on_event(data, _event, id):
131	131	var parsed = JSON.parse(data)
132	132
133	133	if parsed.error != OK:
…	…	@@ -145,7 +145,7 @@ func start_listening():
145	145	func _on_HyperEventSource_event(data, event, id):
146	146	_on_event(data, event, id)
147	147
148		func _on_HyperGateway_started_gateway(pid):
	148	func _on_HyperGateway_started_gateway(_pid):
149	149	start_listening()
150	150	list_peers()
151	151	broadcast_identity()

src/HyperChat/HyperChat.tscn +1 -0

…	…	@@ -51,6 +51,7 @@ text = "System: Enter some text and hit `send` to broadcast it to peers.
51	51	"
52	52
53	53	[node name="HyperGateway" parent="." instance=ExtResource( 2 )]
	54	autoStart = false
54	55
55	56	[node name="HyperEventSource" type="Node" parent="HyperGateway"]
56	57	script = ExtResource( 3 )

src/HyperGateway/HyperGateway.gd +148 -32

…	…	@@ -1,17 +1,35 @@
1	1	extends Node
2	2
	3	const URLParser = preload('../utils/URLParser.gd')
	4
3	5	class_name HyperGateway
4	6
5	7	signal starting_gateway()
6	8	signal started_gateway(pid)
7	9
8		export var processPID = 0
9		export var serverPrefix = "http://127.0.0.1:4973/hyper/"
10		export var storageDirectory = 'user://gateway-data/'
11		export var autoStart = false
	10	signal started_download(version)
	11	signal finished_download(version)
	12
12	13	export var writable = true
13	14	export var persist = true
14	15
	16	export var autoStart = true
	17	export var autoDownload = true
	18	export var autoUpdate = false
	19
	20	export var storageDirectory = "user://gateway-data/"
	21	export var repositoryName = "rangermauve/hyper-gateway"
	22	export var tagStart = "v2"
	23
	24	## TODO: Use this tag if the `latest` release doesn't match the tag?
	25	# export var defaultTag = "v2.1.3"
	26
	27	var processPID = 0
	28	var latestInfoRequest = HTTPRequest.new()
	29	var downloadFileRequest = HTTPRequest.new()
	30	var downloadingVersion = null
	31	var downloadThread = null
	32
15	33	func _notification(what):
16	34	if what == MainLoop.NOTIFICATION_WM_QUIT_REQUEST:
17	35	cleanupGateway()
…	…	@@ -19,8 +37,21 @@ func _notification(what):
19	37
20	38	# Called when the node enters the scene tree for the first time.
21	39	func _ready():
22		if autoStart: ensureSetup()
23		pass # Replace with function body.
	40	ensureStorageLocation()
	41	add_child(latestInfoRequest)
	42	latestInfoRequest.connect("request_completed", self, "_on_got_latest")
	43
	44	add_child(downloadFileRequest)
	45	downloadFileRequest.connect("request_completed", self, "_on_finished_download")
	46
	47	if autoStart:
	48	start()
	49
	50	func start():
	51	autoStart = true
	52	if autoDownload:
	53	ensureDownloaded()
	54	else: ensureSetup()
24	55
25	56	func cleanupGateway():
26	57	if processPID == 0:
…	…	@@ -28,30 +59,22 @@ func cleanupGateway():
28	59	return
29	60	print('Cleaning up gateway ' + str(processPID))
30	61	OS.kill(processPID)
31		pass
32
33		func _resolvePath(path):
34		var file = File.new()
35		file.open(path, File.READ)
36		var finalPath = file.get_path_absolute()
37		file.close()
38		return finalPath
39	62
40	63	func setupGateway():
41	64	emit_signal("starting_gateway")
42	65	var executiblePath = getExecutiblePath()
43		var path = _resolvePath(executiblePath)
	66	var path = ProjectSettings.globalize_path(executiblePath)
44	67
45	68	var args = ["run"]
46	69	if !persist: args.append('--no-persist')
47	70	if writable: args.append('--writable')
48	71
49		var resolvedStorageDirectory = _resolvePath(storageDirectory)
	72	var resolvedStorageDirectory = ProjectSettings.globalize_path(storageDirectory)
50	73	args.append('--storage-location')
51	74	args.append(resolvedStorageDirectory)
52
53		print("Starting gateway from " + path)
54
	75
	76	print("Starting gateway from ",path, " with args ", args)
	77
55	78	# Start the hyper-gateway in a process
56	79	processPID = OS.execute(path, args, false)
57	80
…	…	@@ -61,23 +84,116 @@ func setupGateway():
61	84
62	85	print("Started gateway at " + str(processPID))
63	86	emit_signal("started_gateway", processPID)
64		pass
65	87
66	88	func ensureSetup():
67		if processPID != 0: return
	89	if processPID != 0: return
68	90	setupGateway()
69		pass
70
71		func getExecutiblePath():
	91
	92	func getExecutibleName():
72	93	var name = OS.get_name()
73		if name == 'X11': return "res://hyper-gateway/hyper-gateway-linux"
74		if name == 'OSX': return "res://hyper-gateway/hyper-gateway-macos"
75		if name == 'Windows': return "res://hyper-gateway/hyper-gateway-windows.exe"
	94	if name == 'X11': return "hyper-gateway-linux"
	95	if name == 'OSX': return "hyper-gateway-macos"
	96	if name == 'Windows': return "hyper-gateway-windows.exe"
76	97	push_error("Can not start gateway, invalid operating system " + name)
77		pass
78	98
79		func defaultDirectory():
	99	func getCurrentVersion():
	100	var file = File.new()
	101	var err = file.open(getVersionFilePath(), File.READ)
	102	if err != OK:
	103	printerr('No existing binary version found', err)
	104	return ""
	105	var version = file.get_as_text()
	106	file.close()
	107	return version
	108
	109	func saveCurrentVersion(version):
	110	var file = File.new()
	111	file.open(getVersionFilePath(), File.WRITE)
	112	file.store_string(version)
	113	file.close()
	114
	115	func getVersionFilePath():
	116	return storageDirectory + 'version.txt'
	117
	118	func getExecutiblePath():
	119	var executibleName = getExecutibleName()
	120	return storageDirectory + executibleName
	121
	122	func ensureStorageLocation():
80	123	var dir = Directory.new()
81		dir.open('user://gateway-data/')
82		return dir.get_current_dir()
83		pass
	124	var err = dir.make_dir_recursive(storageDirectory)
	125	if err != OK:
	126	printerr("Unable to create storage directory ", err)
	127
	128	func hasBinary():
	129	var version = getCurrentVersion()
	130	return version && version.length()
	131
	132	func ensureDownloaded():
	133	if autoUpdate \|\| !hasBinary():
	134	checkLatestVersion()
	135	elif autoStart:
	136	ensureSetup()
	137
	138	func checkLatestVersion():
	139	var url = latestURL()
	140	print('Getting latest version from ' + url)
	141	latestInfoRequest.request(url, [], true, HTTPClient.METHOD_GET)
	142
	143	func _on_got_latest(_result, response_code, _headers, body):
	144	print('Latest info response', response_code)
	145	var parsed = JSON.parse(body.get_string_from_utf8())
	146	if parsed.error != OK:
	147	printerr("Unable to parse latest version from GitHub:", parsed.error_string)
	148	return
	149	var info = parsed.result
	150	var newVersion = info.tag_name
	151
	152	print('Latest version:', newVersion)
	153
	154	var existing = getCurrentVersion()
	155
	156	if newVersion != existing: downloadLatest(info.assets, newVersion)
	157	elif autoStart: ensureSetup()
	158
	159	func downloadLatest(assets, version):
	160	var toDownload = null
	161	var executibleName = getExecutibleName()
	162	for asset in assets:
	163	if asset.name != executibleName: continue
	164	toDownload = asset
	165	if !toDownload:
	166	printerr("Unable to find valid executible in latest release")
	167	return
	168
	169	var fromURL = toDownload.browser_download_url
	170	var toPath = getExecutiblePath()
	171
	172	print('Downloading latest binary:',fromURL)
	173
	174	downloadFileRequest.set_download_file(toPath)
	175
	176	downloadingVersion = version
	177	emit_signal("started_download", version)
	178
	179	downloadFileRequest.request(fromURL, [], true,HTTPClient.METHOD_GET)
	180
	181	func _on_finished_download(_result, response_code, _headers, _body):
	182	var executiblePath = getExecutiblePath()
	183	var path = ProjectSettings.globalize_path(executiblePath)
	184	var os = OS.get_name()
	185
	186	# Mark file as executible if not on Windows
	187	if os != "Windows":
	188	OS.execute("chmod", ["+x", path])
	189
	190	print("Finished download ", response_code)
	191	saveCurrentVersion(downloadingVersion)
	192	emit_signal("finished_download", downloadingVersion)
	193	if autoStart: ensureSetup()
	194
	195	func repoURL():
	196	return "https://api.github.com/repos/" + repositoryName + "/"
	197
	198	func latestURL():
	199	return repoURL() + "releases/latest"

src/HyperLoad/HyperLoad.tscn +0 -1

…	…	@@ -78,7 +78,6 @@ __meta__ = {
78	78	}
79	79
80	80	[node name="HyperGateway" parent="." instance=ExtResource( 6 )]
81		autoStart = true
82	81
83	82	[node name="HyperRequest" parent="HyperGateway" instance=ExtResource( 2 )]
84	83

src/HyperLoad/Output.gd +1 -1

…	…	@@ -1,5 +1,5 @@
1	1	extends RichTextLabel
2	2
3		func _on_HyperLoad_request_completed(result, response_code, headers, body):
	3	func _on_HyperLoad_request_completed(_result, _response_code, _headers, body):
4	4	text = body.get_string_from_utf8()
5	5	pass # Replace with function body.

src/HyperLoad/StatusLabel.gd +2 -2

…	…	@@ -33,12 +33,12 @@ func setGatewayLoading():
33	33	pass # Replace with function body.
34	34
35	35
36		func setGatewayLoaded(pid):
	36	func setGatewayLoaded(_pid):
37	37	text = "Status: Gateway Loaded"
38	38	pass # Replace with function body.
39	39
40	40
41		func _on_HyperLoad_request_completed(result, response_code, headers, body):
	41	func _on_HyperLoad_request_completed(_result, response_code, _headers, body):
42	42	print("Response Code ", response_code)
43	43	if response_code != 200:
44	44	var message = body.get_string_from_utf8()

src/HyperLoad/URLBar.gd +1 -1

…	…	@@ -24,6 +24,6 @@ func navigate():
24	24	pass # Replace with function body.
25	25
26	26
27		func _on_URLBar_text_entered(new_text):
	27	func _on_URLBar_text_entered(_new_text):
28	28	navigate()
29	29	pass # Replace with function body.

src/HyperNotes/HyperNotes.gd +6 -5

…	…	@@ -10,11 +10,6 @@ onready var fileChanges = $HyperGateway/FileChanges
10	10
11	11	export var source = "hyper://notes/"
12	12
13		func _ready():
14		fileChanges.request(source)
15		fileLister.list(source)
16		loader.getContent(filePathInput.text)
17
18	13	func _on_SaveButton_pressed():
19	14	saver.save(filePathInput.text, fileContent.text)
20	15	pass
…	…	@@ -55,3 +50,9 @@ func _on_Files_item_selected():
55	50	func _on_FileChanges_change():
56	51	fileLister.list(source)
57	52	pass # Replace with function body.
	53
	54
	55	func _on_HyperGateway_started_gateway(_pid):
	56	fileChanges.request(source)
	57	fileLister.list(source)
	58	loader.getContent(filePathInput.text)

src/HyperNotes/HyperNotes.tscn +1 -0

…	…	@@ -84,6 +84,7 @@ script = ExtResource( 2 )
84	84	[connection signal="item_selected" from="HBoxContainer/Files" to="." method="_on_Files_item_selected"]
85	85	[connection signal="pressed" from="HBoxContainer/VBoxContainer/HBoxContainer/SaveButton" to="." method="_on_SaveButton_pressed"]
86	86	[connection signal="pressed" from="HBoxContainer/VBoxContainer/HBoxContainer/LoadButton" to="." method="_on_LoadButton_pressed"]
	87	[connection signal="started_gateway" from="HyperGateway" to="." method="_on_HyperGateway_started_gateway"]
87	88	[connection signal="files" from="HyperGateway/ListFiles" to="." method="_on_ListFiles_files"]
88	89	[connection signal="request_completed" from="HyperGateway/ListFiles" to="HyperGateway/ListFiles" method="_on_ListFiles_request_completed"]
89	90	[connection signal="content" from="HyperGateway/GetContent" to="." method="_on_GetContent_content"]

src/HyperRequest/HyperRequest.gd +1 -2

…	…	@@ -19,5 +19,4 @@ func request(
19	19	emit_signal('loading_data', url)
20	20
21	21	print(method, ' ', toLoad)
22		.request(toLoad, custom_headers, ssl_validate_domain, method, request_data)
23		pass
	22	return .request(toLoad, custom_headers, ssl_validate_domain, method, request_data)

src/utils/URLParser.gd +3 -1

…	…	@@ -18,6 +18,7 @@ func parse(url):
18	18	var path = parsed.get_string(3)
19	19	var host = raw_host
20	20	var port = DEFAULT_PORTS[protocol]
	21	var ssl = protocol == "https"
21	22
22	23	if ":" in raw_host:
23	24	var split = raw_host.split(':')
…	…	@@ -28,5 +29,6 @@ func parse(url):
28	29	"protocol": protocol,
29	30	"host": host,
30	31	"port": port,
31		"path": path
	32	"path": path,
	33	"ssl": ssl,
32	34	}

hypergodot commits / cd87f39

Changed files (15) +171 -55