total5 0.0.1-9 → 0.0.2

package/flow-flowstream.js

@@ -81,6 +81,25 @@ function Instance(instance, id) {
 	// this.onoutput = null;
 }
 
+Instance.prototype = {
+
+	get stats() {
+		return this.worker ? this.worker.stats : this.flow.stats;
+	},
+
+	get worker() {
+		return this.flow;
+	},
+
+	get stream() {
+		return this.flow;
+	}
+};
+
+Instance.prototype.postMessage = function(msg) {
+	this.flow.postMessage && this.flow.postMessage(msg);
+};
+
 Instance.prototype.httprequest = function(opt, callback) {
 
 	// opt.route {String} a URL address
@@ -191,7 +210,7 @@ Instance.prototype.httprouting = function() {
 
 				if (meta.headers) {
 					for (var key in meta.headers)
-						self.header(key, meta.headers[key]);
+						self.response.headers[key] = meta.headers[key];
 				}
 
 				if (meta.cookies && meta.cookies instanceof Array) {
@@ -200,7 +219,7 @@ Instance.prototype.httprouting = function() {
 						var value = item.value;
 						var expiration = item.expiration || item.expires || item.expire;
 						if (name && value && expiration)
-							self.res.cookie(name, value, expiration, item.options || item.config);
+							self.cookie(name, value, expiration, item.options || item.config);
 					}
 				}
 
@@ -211,13 +230,13 @@ Instance.prototype.httprouting = function() {
 						break;
 					case 'text':
 					case 'plain':
-						self.plain(data);
+						self.text(data);
 						break;
 					case 'html':
-						self.content(data, 'text/html');
+						self.html(data);
 						break;
 					case 'xml':
-						self.content(data, 'text/xml');
+						self.binary(Buffer.from(data, 'utf8'), 'text/xml');
 						break;
 					case 'json':
 						self.json(data);
@@ -307,20 +326,20 @@ function execfn(self, name, id, data) {
 		if (!flow.paused) {
 			if (id[0] === '@') {
 				id = id.substring(1);
-				for (var key in flow.meta.flow) {
-					var com = flow.meta.flow[key];
+				for (let key in flow.meta.flow) {
+					let com = flow.meta.flow[key];
 					if (com.component === id && com[name])
 						com[name](data);
 				}
 			} else if (id[0] === '#') {
 				id = id.substring(1);
-				for (var key in flow.meta.flow) {
-					var com = flow.meta.flow[key];
+				for (let key in flow.meta.flow) {
+					let com = flow.meta.flow[key];
 					if (com.module.name === id && com[name])
 						com[name](data);
 				}
 			} else {
-				var com = flow.meta.flow[id];
+				let com = flow.meta.flow[id];
 				if (com && com[name])
 					com[name](data);
 			}
@@ -381,6 +400,10 @@ Instance.prototype.restart = function() {
 		self.flow.kill(9);
 };
 
+Instance.prototype.remove = function() {
+	F.TFlow.remove(this.id);
+};
+
 // Destroys the Flow
 Instance.prototype.kill = Instance.prototype.destroy = function() {
 
@@ -388,16 +411,12 @@ Instance.prototype.kill = Instance.prototype.destroy = function() {
 
 	setTimeout(() => exports.refresh(self.id, 'destroy'), 500);
 	self.flow.$destroyed = true;
+	self.flow.$terminated = true;
 
 	if (self.flow.isworkerthread) {
 
-		self.flow.$socket && self.flow.$socket.destroy();
-		self.flow.$client && self.flow.$client.destroy();
-
-		if (self.flow.terminate)
-			self.flow.terminate();
-		else
-			self.flow.kill(9);
+		self.postMessage({ TYPE: 'stream/destroy' });
+		setTimeout(self => self.flow.terminate ? self.flow.terminate() : self.flow.kill(9), 1000, self);
 
 		if (PROXIES[self.id]) {
 			PROXIES[self.id].remove();
@@ -409,11 +428,12 @@ Instance.prototype.kill = Instance.prototype.destroy = function() {
 			for (var key in self.flow.sockets)
 				self.flow.sockets[key].destroy();
 		}
-		self.flow.$socket && self.flow.$socket.destroy();
-		self.flow.$client && self.flow.$client.destroy();
 		self.flow.destroy();
 	}
 
+	self.flow.$socket && self.flow.$socket.destroy();
+	self.flow.$client && self.flow.$client.destroy();
+
 	for (var key in CALLBACKS) {
 		if (CALLBACKS[key].id === self.id)
 			delete CALLBACKS[key];
@@ -594,13 +614,22 @@ Instance.prototype.reload = function(data) {
 
 	if (flow.isworkerthread) {
 
-		if (data.proxypath)
+		if (data.proxypath) {
+
+			if (!data.unixsocket) {
+				data.unixsocket = flow.$schema.unixsocket || makeunixsocket(data.id);
+				flow.$schema.unixsocket = data.unixsocket;
+			}
+
 			PROXIES[data.id] = F.proxy(data.proxypath, data.unixsocket);
+		}
 
 		for (let key in data)
 			flow.$schema[key] = data[key];
+
 		self.proxypath = data.proxypath;
 		flow.postMessage2({ TYPE: 'stream/rewrite', data: data });
+
 	} else {
 		for (let key in data)
 			flow.$schema[key] = data[key];
@@ -774,7 +803,7 @@ function send(self, id, data, callback) {
 	} else if (id[0] === '#') {
 		id = id.substring(1);
 		for (let key in instances) {
-			if (instances[key].module && instances[key].module.id === id) {
+			if (instances[key].module.name === id) {
 				instance = instances[key];
 				break;
 			}
@@ -834,14 +863,14 @@ function exec(self, opt) {
 
 	if (opt.id[0] === '@') {
 		id = opt.id.substring(1);
-		for (var key in instances) {
+		for (let key in instances) {
 			if (instances[key].component === id)
 				target.push(instances[key]);
 		}
 	} else if (opt.id[0] === '#') {
 		id = opt.id.substring(1);
-		for (var key in instances) {
-			if (instances[key].module.id === id)
+		for (let key in instances) {
+			if (instances[key].module.name === id)
 				target.push(instances[key]);
 		}
 	} else {
@@ -958,7 +987,7 @@ function init_current(meta, callback, nested) {
 
 	// Due to C/C++ modules
 	if (W.workerData || meta.sandbox)
-		CONF.$node_modules = F.path.join(meta.directory, meta.id, 'node_modules');
+		F.config.$node_modules = F.path.join(meta.directory, meta.id, 'node_modules');
 
 	ASFILES = meta.asfiles === true;
 
@@ -977,6 +1006,12 @@ function init_current(meta, callback, nested) {
 		}
 	}
 
+	flow.env = meta.env;
+	flow.origin = meta.origin;
+	flow.proxypath = meta.proxypath || '';
+	flow.proxy.online = false;
+	flow.proxy.ping = 0;
+
 	if (meta.import) {
 		var tmp = meta.import.split(/,|;/).trim();
 		for (var m of tmp) {
@@ -986,11 +1021,13 @@ function init_current(meta, callback, nested) {
 		}
 	}
 
-	flow.env = meta.env;
-	flow.origin = meta.origin;
-	flow.proxypath = meta.proxypath || '';
-	flow.proxy.online = false;
-	flow.proxy.ping = 0;
+	if (meta.initscript) {
+		try {
+			new Function('instance', meta.initscript)(flow);
+		} catch (e) {
+			flow.error(e, 'initscript');
+		}
+	}
 
 	flow.$instance = new Instance(flow, meta.id);
 
@@ -999,7 +1036,6 @@ function init_current(meta, callback, nested) {
 	};
 
 	if (!nested && Parent) {
-
 		Parent.on('message', function(msg) {
 
 			var id;
@@ -1011,6 +1047,10 @@ function init_current(meta, callback, nested) {
 					flow.proxy.ping = setTimeout(killprocess, 10000);
 					break;
 
+				case 'stream/destroy':
+					flow.destroy();
+					break;
+
 				case 'stream/export':
 					msg.data = flow.export2();
 					Parent.postMessage(msg);
@@ -1235,6 +1275,10 @@ function init_current(meta, callback, nested) {
 			}
 		});
 
+		flow.proxy.remove = function() {
+			Parent.postMessage({ TYPE: 'stream/remove' });
+		};
+
 		flow.proxy.kill = function() {
 			Parent.postMessage({ TYPE: 'stream/kill' });
 		};
@@ -1268,12 +1312,20 @@ function init_current(meta, callback, nested) {
 			var componentid = '';
 
 			if (instance) {
-				if (source === 'instance_message') {
+				if (typeof(instance) === 'string') {
+					if (source === 'add') {
+						componentid = instance;
+						F.error(err, 'FlowStream | register component | ' + instance);
+					} else if (meta.design[instance]) {
+						instanceid = instance;
+						componentid = meta.design[instance].component;
+					}
+				} else if (source === 'instance_message') {
 					if (instance.instance) {
 						instanceid = instance.instance.id;
 						componentid = instance.instance.component;
 					} else
-						console.log('ERROR', instance);
+						F.error(err, 'FlowStream | message | ' + instance);
 				} else if (source === 'instance_close') {
 					instanceid = instance.id;
 					componentid = instance.component;
@@ -1336,6 +1388,10 @@ function init_current(meta, callback, nested) {
 			// nothing
 		};
 
+		flow.proxy.remove = function() {
+			flow.$instance.remove();
+		};
+
 		flow.proxy.kill = function() {
 			flow.$instance.kill();
 		};
@@ -1370,8 +1426,8 @@ function init_current(meta, callback, nested) {
 
 		flow.proxy.error = function(err, source, instance) {
 
-			var instanceid = '';
-			var componentid = '';
+			let instanceid = '';
+			let componentid = '';
 
 			if (instance) {
 				if (source === 'instance_message') {
@@ -1392,6 +1448,9 @@ function init_current(meta, callback, nested) {
 				}
 			}
 
+			let tmp = { TYPE: 'flow/error', error: err.toString(), source: source, id: instanceid, component: componentid, ts: new Date() };
+			flow.$socket && flow.$socket.send(tmp);
+			flow.$client && flow.$client.send(tmp);
 			flow.$instance.onerror && flow.$instance.onerror(err, source, instanceid, componentid);
 		};
 
@@ -1414,7 +1473,7 @@ function init_worker(meta, type, callback) {
 	var worker = type === 'worker' ? (new W.Worker(__filename, { workerData: meta })) : Fork(__filename, forkargs, { serialization: 'json', detached: false });
 	var ischild = false;
 
-	meta.unixsocket = F.isWindows ? ('\\\\?\\pipe\\flowstream' + F.directory.makeid() + meta.id + Date.now().toString(36)) : (F.Path.join(F.Os.tmpdir(), 'flowstream_' + F.directory.makeid() + '_' + meta.id + '_' + Date.now().toString(36) + '.socket'));
+	meta.unixsocket = makeunixsocket(meta.id);
 
 	if (PROXIES[meta.id]) {
 		PROXIES[meta.id].remove();
@@ -1466,10 +1525,14 @@ function init_worker(meta, type, callback) {
 
 		var tmp;
 
+		Flow.$events.message && Flow.emit('message', worker.$instance.id, msg);
+
 		switch (msg.TYPE) {
 
 			case 'stream/stats':
 				worker.stats = msg.data;
+				if (Flow.$events.stats)
+					Flow.emit('stats', meta.id, msg.data);
 				break;
 
 			case 'stream/restart':
@@ -1484,6 +1547,11 @@ function init_worker(meta, type, callback) {
 					worker.$instance.destroy(msg.code || 9);
 				break;
 
+			case 'stream/remove':
+				if (!worker.$terminated)
+					worker.$instance.remove();
+				break;
+
 			case 'stream/send':
 				tmp = CALLBACKS[msg.callbackid];
 				if (tmp) {
@@ -1843,51 +1911,44 @@ function MAKEFLOWSTREAM(meta) {
 		}
 	};
 
+	function stringifyskip(key, value) {
+		return key === '$$ID' || key === '$$REQUIRED' ? undefined : value;
+	}
+
 	flow.export2 = function() {
 
 		var variables = flow.variables;
 		var design = {};
 		var components = {};
-		var sources = {};
-
-		for (var key in flow.sources) {
-			var com = flow.sources[key];
-			sources[key] = com;
-		}
+		var sources = flow.sources ? JSON.parse(JSON.stringify(flow.sources, stringifyskip)) : {};
 
-		for (var key in flow.meta.components) {
-			var com = flow.meta.components[key];
+		for (let key in flow.meta.components) {
+			let com = flow.meta.components[key];
 			components[key] = com.ui.raw;
 		}
 
-		for (var key in flow.meta.flow)
+		for (let key in flow.meta.flow) {
 			design[key] = flow.export_instance2(key);
+			delete design[key].template;
+		}
 
 		var data = {};
+		var blacklist = { unixsocket: 1, components: 1, variables2: 1, sources: 1, design: 1, size: 1, directory: 1 };
+
+		for (let key in flow.$schema) {
+			if (!blacklist[key])
+				data[key] = flow.$schema[key];
+		}
+
 		data.paused = flow.paused;
-		data.id = flow.$schema.id;
-		data.reference = flow.$schema.reference;
-		data.author = flow.$schema.author;
-		data.group = flow.$schema.group;
-		data.icon = flow.$schema.icon;
-		data.color = flow.$schema.color;
-		data.version = flow.$schema.version;
-		data.cloning = flow.$schema.cloning;
-		data.readme = flow.$schema.readme;
-		data.url = flow.$schema.url;
-		data.name = flow.$schema.name;
 		data.components = components;
 		data.design = design;
 		data.variables = variables;
 		data.sources = sources;
-		data.proxypath = flow.$schema.proxypath;
-		data.origin = flow.$schema.origin;
-		data.dtcreated = flow.$schema.dtcreated;
-		data.import = flow.$schema.import;
 		return data;
 	};
 
-	var save_force = function() {
+	var saveforce = function() {
 		saveid && clearTimeout(saveid);
 		saveid = null;
 		flow.proxy.save(flow.export2());
@@ -1903,13 +1964,17 @@ function MAKEFLOWSTREAM(meta) {
 			return;
 
 		clearTimeout(saveid);
-		saveid = setTimeout(save_force, 5000);
+		saveid = setTimeout(saveforce, 5000);
 	};
 
 	flow.save = function() {
 		save();
 	};
 
+	flow.remove = function() {
+		flow.proxy.remove();
+	};
+
 	flow.kill = function(code) {
 		flow.proxy.kill(code);
 	};
@@ -1945,7 +2010,7 @@ function MAKEFLOWSTREAM(meta) {
 	};
 
 	flow.redraw = refresh_components;
-	flow.sources = meta.sources;
+	flow.sources = meta.sources || {};
 	flow.proxy = {};
 
 	flow.proxy.variables = function(data) {
@@ -1962,6 +2027,9 @@ function MAKEFLOWSTREAM(meta) {
 	};
 
 	flow.proxy.message = function(msg, clientid, callback) {
+
+		var tmp;
+
 		switch (msg.TYPE) {
 
 			case 'call':
@@ -2243,6 +2311,19 @@ function MAKEFLOWSTREAM(meta) {
 				break;
 
 			case 'component_read':
+
+				tmp = flow.meta.components[msg.id];
+				if (tmp && tmp.meta) {
+					if (tmp.meta.readonly) {
+						msg.TYPE = 'flow/component_read';
+						msg.data = null;
+						msg.error = 'The component cannot be edited';
+						flow.proxy.online && flow.proxy.send(msg, 1, clientid);
+						callback && callback(msg);
+						return;
+					}
+				}
+
 				msg.TYPE = 'flow/component_read';
 				msg.data = flow.meta.components[msg.id] ? flow.meta.components[msg.id].ui.raw : null;
 				msg.error = msg.data == null ? 'Not found' : null;
@@ -2251,6 +2332,19 @@ function MAKEFLOWSTREAM(meta) {
 				break;
 
 			case 'component_save':
+
+				// check prev functionality
+				tmp = flow.meta.components[msg.id];
+				if (tmp && tmp.meta) {
+					if (tmp.meta.readonly) {
+						msg.TYPE = 'flow/component_save';
+						msg.error = 'The component cannot be edited';
+						flow.proxy.online && flow.proxy.send(msg, 1, clientid);
+						callback && callback(msg);
+						return;
+					}
+				}
+
 				flow.add(msg.id, msg.data, function(err) {
 					delete msg.data;
 					msg.TYPE = 'flow/component_save';
@@ -2263,10 +2357,24 @@ function MAKEFLOWSTREAM(meta) {
 				break;
 
 			case 'component_remove':
+
+				// check prev functionality
+				tmp = flow.meta.components[msg.id];
+				if (tmp && tmp.meta) {
+					if (tmp.meta.protected) {
+						msg.TYPE = 'flow/component_remove';
+						msg.error = 'The component cannot be removed';
+						flow.proxy.online && flow.proxy.send(msg, 1, clientid);
+						callback && callback(msg);
+						return;
+					}
+				}
+
 				flow.unregister(msg.id, function() {
 					refresh_components();
 					save();
 				});
+
 				break;
 		}
 	};
@@ -2340,7 +2448,8 @@ function MAKEFLOWSTREAM(meta) {
 
 		if (stats.minutes !== minutes) {
 			minutes = stats.minutes;
-			memory = process.memoryUsage().heapUsed;
+			if (isFLOWSTREAMWORKER)
+				memory = process.memoryUsage().heapUsed;
 		}
 
 		flow.stats.memory = memory;
@@ -2349,7 +2458,13 @@ function MAKEFLOWSTREAM(meta) {
 		// Each 9 seconds
 		if (notifier % 3 === 0) {
 			notifier = 0;
-			Parent && Parent.postMessage({ TYPE: 'stream/stats', data: { paused: flow.paused, messages: flow.stats.messages, pending: flow.stats.pending, memory: flow.stats.memory, minutes: flow.stats.minutes, errors: flow.stats.errors, mm: flow.stats.mm }});
+			if (Parent || Flow.$events.stats) {
+				let pstats = { paused: flow.paused, messages: flow.stats.messages, pending: flow.stats.pending, memory: flow.stats.memory, minutes: flow.stats.minutes, errors: flow.stats.errors, mm: flow.stats.mm, pid: process.pid };
+				if (Parent)
+					Parent.postMessage({ TYPE: 'stream/stats', data: pstats });
+				else if (Flow.$events.stats)
+					Flow.emit(flow.$schema.id, pstats);
+			}
 		}
 
 		notifier++;
@@ -2580,12 +2695,22 @@ function MAKEFLOWSTREAM(meta) {
 	});
 
 	var makemeta = function() {
-		return { TYPE: 'flow/flowstream', id: flow.$schema.id, version: VERSION, paused: flow.paused, node: F.version_node, total: F.version, name: flow.$schema.name, version2: flow.$schema.version, icon: flow.$schema.icon, reference: flow.$schema.reference, author: flow.$schema.author, color: flow.$schema.color, origin: flow.$schema.origin, notify: flow.$schema.origin + NOTIFYPATH + flow.$schema.id + '-/', readme: flow.$schema.readme, url: flow.$schema.url, proxypath: flow.$schema.proxypath, env: flow.$schema.env, worker: isFLOWSTREAMWORKER ? (W.workerData ? 'Worker Thread' : 'Child Process') : false, cloning: flow.cloning };
+		return { TYPE: 'flow/flowstream', id: flow.$schema.id, version: VERSION, paused: flow.paused, node: F.version_node, total: F.version, name: flow.$schema.name, version2: flow.$schema.version, icon: flow.$schema.icon, reference: flow.$schema.reference, author: flow.$schema.author, color: flow.$schema.color, origin: flow.$schema.origin, notify: flow.$schema.origin + NOTIFYPATH + flow.$schema.id + '-/', readme: flow.$schema.readme, url: flow.$schema.url, proxypath: isFLOWSTREAMWORKER ? flow.$schema.proxypath : '/', env: flow.$schema.env, worker: isFLOWSTREAMWORKER ? (W.workerData ? 'Worker Thread' : 'Child Process') : false, cloning: flow.cloning };
 	};
 
 	flow.proxy.refreshmeta = function() {
+
 		flow.origin = flow.$schema.origin;
 		flow.proxypath = flow.$schema.proxypath || '';
+
+		if (isFLOWSTREAMWORKER) {
+			if (flow.proxypath) {
+				if (!F.server)
+					F.httpload({ unixsocket: flow.$schema.unixsocket });
+			} else if (F.server)
+				F.server.close();
+		}
+
 		flow.cloning = flow.$schema.cloning != false;
 		flow.proxy.send(makemeta(), 0);
 	};
@@ -2831,13 +2956,14 @@ TMS.connect = function(fs, sourceid, callback) {
 	callback && setImmediate(callback);
 };
 
+// In the Flow will be the "Publish" mentioned in the "Subscribe" group
 const TEMPLATE_PUBLISH = `<script total>
 
 	exports.name = '{0}';
 	exports.icon = '{3}';
 	exports.config = {};
 	exports.outputs = [{ id: 'publish', name: 'Output' }];
-	exports.group = 'Publishers';
+	exports.group = 'Subscribe';
 	exports.type = 'pub';
 	exports.schemaid = ['{7}', '{1}'];
 
@@ -2864,11 +2990,12 @@ const TEMPLATE_PUBLISH = `<script total>
 	</header>
 </body>`;
 
+// In the Flow will be the "Subscribe" mentioned in the "Publish" group
 const TEMPLATE_SUBSCRIBE = `<script total>
 
 	exports.name = '{0}';
 	exports.icon = '{3}';
-	exports.group = 'Subscribers';
+	exports.group = 'Publish';
 	exports.config = {};
 	exports.inputs = [{ id: 'subscribe', name: 'Input' }];
 	exports.type = 'sub';
@@ -3190,6 +3317,10 @@ function initrunning() {
 
 }
 
+function makeunixsocket(id) {
+	return F.isWindows ? ('\\\\?\\pipe\\flowstream' + F.directory.makeid() + id + Date.now().toString(36)) : (F.Path.join(F.Os.tmpdir(), 'flowstream_' + F.directory.makeid() + '_' + id + '_' + Date.now().toString(36) + '.socket'));
+}
+
 if (process.argv[1].endsWith('flow-flowstream.js')) {
 
 	isFLOWSTREAMWORKER = W.workerData || process.argv.indexOf('--fork') !== -1;

package/flow.js

@@ -1,4 +1,6 @@
-// Internal module
+// Total.js Flow module
+// The MIT License
+// Copyright 2023 (c) Peter Širka <petersirka@gmail.com>
 
 'use strict';
 
@@ -40,7 +42,7 @@ FS.onerror = function(err, source, id, componentid, stack) {
 		meta.source = source;
 		meta.instanceid = id;
 		meta.componentid = componentid;
-		FS.$events.error && FS.emit('error', meta);
+		F.emit('flowstream_error', meta);
 	}
 
 };
@@ -68,6 +70,7 @@ FS.remove = function(id) {
 };
 
 FS.reload = function(flow, restart = false) {
+
 	var prev = FS.instances[flow.id];
 	if (!prev)
 		return false;
@@ -75,7 +78,7 @@ FS.reload = function(flow, restart = false) {
 	FS.db[flow.id] = flow;
 
 	var instance = FS.instances[flow.id];
-	instance.worker = flow.worker;
+	instance.workertype = flow.worker;
 	instance.proxypath = flow.proxypath;
 
 	if (restart)
@@ -129,6 +132,9 @@ FS.init = function(directory, callback) {
 
 FS.load = function(flow, callback) {
 
+	if (!flow.id)
+		flow.id = F.TUtils.random_string(10).toLowerCase();
+
 	// flow.directory {String}
 	// flow.asfiles {Boolean}
 	// flow.worker {String/Boolean}
@@ -147,12 +153,6 @@ FS.load = function(flow, callback) {
 
 	FS.module.init(flow, flow.worker, function(err, instance) {
 
-		FS.$events.load && FS.emit('load', instance, flow);
-
-		// instance.httprouting();
-		if (callback)
-			instance.ondone = err => callback(err,  err ? null : instance);
-
 		instance.onerror = FS.onerror;
 
 		instance.onsave = function(data) {
@@ -162,6 +162,12 @@ FS.load = function(flow, callback) {
 		};
 
 		FS.instances[id] = instance;
+
+		// instance.httprouting();
+		instance.ondone = function(err) {
+			FS.$events.load && FS.emit('load', instance, flow);
+			callback && callback(err, err ? null : instance);
+		};
 	});
 
 };
@@ -229,4 +235,4 @@ global.FlowStream = exports;
 setImmediate(function() {
 	FS.socket = FS.module.socket;
 	FS.client = FS.module.client;
-});
+});

package/flowstream.js

@@ -754,7 +754,7 @@ FP.destroy = function() {
 		self.emit('destroy');
 		self.meta = null;
 		self.$events = null;
-		delete F.flows[self.name];
+		delete F.flowstreams[self.name];
 	});
 
 };
@@ -1266,8 +1266,8 @@ FP.load = function(data, callback) {
 			self.use(data.design, function(err) {
 				self.inc(0);
 				err && error.push(err);
-				callback && callback(err);
 				self.clean();
+				callback && callback(err);
 			});
 
 		});
@@ -1320,8 +1320,8 @@ FP.rewrite = function(data, callback) {
 
 				self.inc(0);
 				err && error.push(err);
-				callback && callback(err);
 				self.clean();
+				callback && callback(err);
 			});
 		});
 	});
@@ -1602,6 +1602,7 @@ FP.initcomponent = function(key, component) {
 	instance.transform = newtransform;
 	instance.replace = variables;
 	instance.instances = self.meta.flow;
+	instance.components = self.meta.components;
 
 	self.onconnect && self.onconnect(instance);
 	self.$events.connect && self.emit('connect', instance);