split manifests, merge configs

Moddable-OpenSource · Jun 28, 2022 · 8866947 · 8866947
1 parent ec4e727
commit 8866947
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 78 deletions.
diff --git a/examples/io/tcp/fetch/config.js b/examples/io/tcp/fetch/config.js
diff --git a/examples/io/tcp/fetch/manifest.json b/examples/io/tcp/fetch/manifest.json
@@ -1,30 +1,11 @@
 {
 	"include": [
-		"$(MODDABLE)/modules/io/manifest.json"
+		"$(MODDABLE)/examples/io/tcp/fetch/manifest_fetch.json"
 	],
 	"creation": {
 		"static": 65536
 	},
 	"modules": {
-		"*": [
-			"./config",
-			"./fetch",
-			"./main",
-			"$(MODULES)/network/dns/moddnsparser"
-		],
-		"embedded:network/dns/resolver/udp": "../../udp/dns/dns",
-		"dns": "$(MODULES)/network/dns/dns",
-		"dns/parser": "$(MODULES)/network/dns/dnsparser",
-		"dns/serializer": "$(MODULES)/network/dns/dnsserializer",
-		"embedded:network/http/client": "./../httpclient/httpclient"
-	},
-	"preload": [
-		"config",
-		"embedded:network/dns/resolver",
-		"dns",
-		"dns/parser",
-		"dns/serializer",
-		"embedded:network/http/request",
-		"fetch"
-	]
+		"*": "./main"
+	}
 }
diff --git a/examples/io/tcp/fetch/manifest_fetch.json b/examples/io/tcp/fetch/manifest_fetch.json
@@ -0,0 +1,11 @@
+{
+	"include": [
+		"$(MODDABLE)/examples/io/tcp/httpclient/manifest_httpclient.json"
+	],
+	"modules": {
+		"*": "./fetch"
+	},
+	"preload": [
+		"fetch"
+	]
+}
diff --git a/examples/io/tcp/httpclient/config.js b/examples/io/tcp/httpclient/config.js
@@ -1,3 +1,5 @@
+import "system"		// system initializes globalThis.device. this ensures it runs before this module.
+
 import TCP from "embedded:io/socket/tcp";
 import UDP from "embedded:io/socket/udp";
 import Resolver from "embedded:network/dns/resolver/udp";
@@ -16,6 +18,7 @@ const dns = {
 globalThis.device = Object.freeze({
 	...globalThis.device,
 	network: {
+		...globalThis.device?.network,
 		http: {
 			io: HTTPClient,
 			dns,

diff --git a/examples/io/tcp/httpclient/httpclient.js b/examples/io/tcp/httpclient/httpclient.js
@@ -135,10 +135,9 @@ class HTTPClient {
 		this.#onClose = onClose;
 
 		const dns = new options.dns.io(options.dns);
-
 		dns.resolve({
 			host: this.#host, 
-		
+
 			onResolved: (host, address) => {
 				this.#socket = new options.socket.io({
 					...options.socket,
@@ -149,16 +148,15 @@ class HTTPClient {
 					onError: this.#onError.bind(this)
 				});
 			},
-			onError: (err) => {
+			onError: () => {
 				this.#onError?.();
-			},
+			}
 		});
-
 	}
 	close() {
 		this.#socket?.close();
 		this.#socket = undefined;
-			Timer.clear(this.#timer);
+		Timer.clear(this.#timer);
 		this.#timer = undefined;
 	}
 	request(options) {

diff --git a/examples/io/tcp/httpclient/manifest.json b/examples/io/tcp/httpclient/manifest.json
@@ -1,26 +1,9 @@
 {
 	"include": [
-		"$(MODDABLE)/modules/io/manifest.json",
+		"./manifest_httpclient.json",
 		"$(MODDABLE)/modules/data/text/decoder/manifest.json"
 	],
 	"modules": {
-		"*": [ 
-			"./config",
-			"./main",
-			"$(MODULES)/network/dns/moddnsparser"
-		],
-		"embedded:network/dns/resolver/udp": "../../udp/dns/dns",
-		"dns": "$(MODULES)/network/dns/dns",
-		"dns/parser": "$(MODULES)/network/dns/dnsparser",
-		"dns/serializer": "$(MODULES)/network/dns/dnsserializer",
-		"embedded:network/http/client": "./../httpclient/httpclient"
-	},
-	"preload": [
-		"config",
-		"embedded:network/dns/resolver",
-		"dns",
-		"dns/parser",
-		"dns/serializer",
-		"embedded:network/http/client"
-	]
+		"*": "./main"
+	}
 }
diff --git a/examples/io/tcp/httpclient/manifest_httpclient.json b/examples/io/tcp/httpclient/manifest_httpclient.json
@@ -0,0 +1,24 @@
+{
+	"include": [
+		"$(MODDABLE)/modules/io/manifest.json"
+	],
+	"modules": {
+		"*": [ 
+			"$(MODULES)/network/dns/moddnsparser"
+		],
+		"httpclient/config": "./config",
+		"embedded:network/dns/resolver/udp": "../../udp/dns/dns",
+		"dns": "$(MODULES)/network/dns/dns",
+		"dns/parser": "$(MODULES)/network/dns/dnsparser",
+		"dns/serializer": "$(MODULES)/network/dns/dnsserializer",
+		"embedded:network/http/client": "./../httpclient/httpclient"
+	},
+	"preload": [
+		"httpclient/config",
+		"embedded:network/dns/resolver",
+		"dns",
+		"dns/parser",
+		"dns/serializer",
+		"embedded:network/http/client"
+	]
+}
diff --git a/examples/io/tcp/mqttclient/config.js b/examples/io/tcp/mqttclient/config.js
@@ -18,6 +18,7 @@ const dns = {
 globalThis.device = Object.freeze({
 	...globalThis.device,
 	network: {
+		...globalThis.device?.network,
 		mqtt: {
 			io: MQTTClient,
 			dns,

diff --git a/examples/io/tcp/mqttclient/manifest_mqttclient.json b/examples/io/tcp/mqttclient/manifest_mqttclient.json
@@ -1,17 +1,17 @@
 {
 	"modules": {
 		"*": [ 
-			"./config",
 			"$(MODULES)/network/dns/moddnsparser"
 		],
+		"mqttclient/config": "./config",
 		"embedded:network/dns/resolver/udp": "../../udp/dns/dns",
 		"dns": "$(MODULES)/network/dns/dns",
 		"dns/parser": "$(MODULES)/network/dns/dnsparser",
 		"dns/serializer": "$(MODULES)/network/dns/dnsserializer",
 		"embedded:network/mqtt/client": "./mqttclient"
 	},
 	"preload": [
-		"config",
+		"mqttclient/config",
 		"embedded:network/dns/resolver",
 		"dns",
 		"dns/parser",