@pixui-dev/pxw 0.1.34 → 0.1.35

package/lib/grpcTransport/PixHttp2Transport.ts

@@ -1,107 +1,107 @@
-import { grpc } from '@improbable-eng/grpc-web';
-import { TransportOptions } from '@improbable-eng/grpc-web/dist/typings/transports/Transport';
-import { Metadata } from '@improbable-eng/grpc-web/dist/typings/metadata';
-import { ProtobufMessage, ProtobufMessageClass } from '@improbable-eng/grpc-web/dist/typings/message';
-
-let debug = console.log;
-
-const FINISH_SEND = 1;
-
-function isEmpty(value) {
-	return value === undefined || value === '' || value === null;
-}
-
-function headersToBytes(headers) {
-	let asString = [];
-	headers.forEach(function (key, values) {
-		asString[String(key)] = values;
-	});
-	return asString;
-}
-
-export class Http2PixTransport implements grpc.Transport {
-	constructor(public options) {
-		options.debug && debug('GrpcPixTransport', options);
-		this.initHttp2();
-	}
-	pixuiGrpcAddress = this.options.url;
-	headers = new grpc.Metadata();
-	sendQueue: Array<any> = [];
-	flag = false;
-	px: any;
-
-	initHttp2 = () => {
-		if (!window['isHttp2Started']) {
-			window.Http2Connection.init();
-			window['isHttp2Started'] = setInterval(function () {
-				window.Http2Connection.run();
-			}, 100);
-		}
-	};
-	sendMsg = (toSend) => {
-		if (toSend === FINISH_SEND) {
-			this.options.debug && debug('sendMsg', toSend);
-			this.px.send(new Uint8Array([1]));
-		}
-		else {
-			this.options.debug && debug('sendMsg', toSend);
-			this.px.send(toSend);
-		}
-	};
-	sendMessage = (msgBytes) => {
-		if (!this.px) {
-			this.sendQueue.push(msgBytes);
-		}
-		else {
-			this.sendMsg(msgBytes);
-		}
-	};
-	finishSend = () => {
-		if (!this.px) {
-			this.sendQueue.push(FINISH_SEND);
-		}
-		else {
-			this.sendMsg(FINISH_SEND);
-		}
-	};
-	onHeaders = (e) => {
-		let str = String(e);
-		let splitted = str.split(':', 2);
-		if (!isEmpty(splitted[0]) && !isEmpty(splitted[1])) {
-			this.headers.set(splitted[0], splitted[1]);
-		}
-	};
-	onChunk = (e) => {
-		if (!this.flag) {
-			this.flag = true;
-			// this.headers.set('grpc-status','0');
-			// this.headers.set('grpc-message','OK');
-			this.options.debug && debug('pixuiGrpc.onHeaders', this.headers);
-			this.options.onHeaders(this.headers, 200);
-		}
-		let data = new Uint8Array(e);
-		this.options.debug && debug('onChunk', data);
-		this.options.onChunk(data);
-	};
-	onEnd = (vv) => {
-		console.log(vv['resCode'], vv['time']);
-		this.options.debug && debug('pixuiGrpc.onEnd');
-		this.options.onEnd();
-		this.px = null;
-	};
-	start = (metadata) => {
-		this.options.debug && debug('pixuiGrpc-start', JSON.stringify(metadata));
-		this.px = new Http2Connection(this.pixuiGrpcAddress, headersToBytes(metadata), this.options.debug);
-		this.px.setHeadersCallBack(this.onHeaders);
-		this.px.setDataCallBack(this.onChunk);
-		this.px.setEndCallBack(this.onEnd);
-		this.sendQueue.forEach((toSend) => {
-			this.sendMsg(toSend);
-		});
-	};
-	cancel = () => {
-		this.options.debug && debug('pixuiGrpc-cancel');
-		this.options.debug && debug('pixuiGrpc.onclose');
-		this.px.close();
-	};
-}
+import { grpc } from '@improbable-eng/grpc-web';
+import { TransportOptions } from '@improbable-eng/grpc-web/dist/typings/transports/Transport';
+import { Metadata } from '@improbable-eng/grpc-web/dist/typings/metadata';
+import { ProtobufMessage, ProtobufMessageClass } from '@improbable-eng/grpc-web/dist/typings/message';
+
+let debug = console.log;
+
+const FINISH_SEND = 1;
+
+function isEmpty(value) {
+	return value === undefined || value === '' || value === null;
+}
+
+function headersToBytes(headers) {
+	let asString = [];
+	headers.forEach(function (key, values) {
+		asString[String(key)] = values;
+	});
+	return asString;
+}
+
+export class Http2PixTransport implements grpc.Transport {
+	constructor(public options) {
+		options.debug && debug('GrpcPixTransport', options);
+		this.initHttp2();
+	}
+	pixuiGrpcAddress = this.options.url;
+	headers = new grpc.Metadata();
+	sendQueue: Array<any> = [];
+	flag = false;
+	px: any;
+
+	initHttp2 = () => {
+		if (!window['isHttp2Started']) {
+			window.Http2Connection.init();
+			window['isHttp2Started'] = setInterval(function () {
+				window.Http2Connection.run();
+			}, 100);
+		}
+	};
+	sendMsg = (toSend) => {
+		if (toSend === FINISH_SEND) {
+			this.options.debug && debug('sendMsg', toSend);
+			this.px.send(new Uint8Array([1]));
+		}
+		else {
+			this.options.debug && debug('sendMsg', toSend);
+			this.px.send(toSend);
+		}
+	};
+	sendMessage = (msgBytes) => {
+		if (!this.px) {
+			this.sendQueue.push(msgBytes);
+		}
+		else {
+			this.sendMsg(msgBytes);
+		}
+	};
+	finishSend = () => {
+		if (!this.px) {
+			this.sendQueue.push(FINISH_SEND);
+		}
+		else {
+			this.sendMsg(FINISH_SEND);
+		}
+	};
+	onHeaders = (e) => {
+		let str = String(e);
+		let splitted = str.split(':', 2);
+		if (!isEmpty(splitted[0]) && !isEmpty(splitted[1])) {
+			this.headers.set(splitted[0], splitted[1]);
+		}
+	};
+	onChunk = (e) => {
+		if (!this.flag) {
+			this.flag = true;
+			// this.headers.set('grpc-status','0');
+			// this.headers.set('grpc-message','OK');
+			this.options.debug && debug('pixuiGrpc.onHeaders', this.headers);
+			this.options.onHeaders(this.headers, 200);
+		}
+		let data = new Uint8Array(e);
+		this.options.debug && debug('onChunk', data);
+		this.options.onChunk(data);
+	};
+	onEnd = (vv) => {
+		console.log(vv['resCode'], vv['time']);
+		this.options.debug && debug('pixuiGrpc.onEnd');
+		this.options.onEnd();
+		this.px = null;
+	};
+	start = (metadata) => {
+		this.options.debug && debug('pixuiGrpc-start', JSON.stringify(metadata));
+		this.px = new Http2Connection(this.pixuiGrpcAddress, headersToBytes(metadata), this.options.debug);
+		this.px.setHeadersCallBack(this.onHeaders);
+		this.px.setDataCallBack(this.onChunk);
+		this.px.setEndCallBack(this.onEnd);
+		this.sendQueue.forEach((toSend) => {
+			this.sendMsg(toSend);
+		});
+	};
+	cancel = () => {
+		this.options.debug && debug('pixuiGrpc-cancel');
+		this.options.debug && debug('pixuiGrpc.onclose');
+		this.px.close();
+	};
+}

package/lib/grpcTransport/PixLuaTransport.ts

@@ -1,82 +1,82 @@
-import { grpc } from '@improbable-eng/grpc-web';
-import { TransportOptions } from '@improbable-eng/grpc-web/dist/typings/transports/Transport';
-import { Metadata } from '@improbable-eng/grpc-web/dist/typings/metadata';
-
-let debug = console.log;
-let callbackId = 0;
-let pendingCall = {};
-
-function getNewID() {
-	let id = callbackId;
-	callbackId += 1;
-	return id.toString();
-}
-//接收调用返回值
-(window as any).onRPCMessage = function (msg) {
-	window.requestAnimationFrame(() => {
-		let res = JSON.parse(msg);
-		let func = pendingCall[res.meta.callbackId];
-		func(res);
-	});
-};
-
-export class LuaPixTransport implements grpc.Transport {
-	constructor(public options: TransportOptions) {
-		window.noProto = true;
-		options.debug && debug('LuaPixTransport', options);
-	}
-
-	headers = new grpc.Metadata();
-	sendMsg = (this.options as any).callFunc;
-	data;
-	responseType = this.options.methodDefinition.responseType.prototype.constructor;
-	meta = new Map<string, string>();
-
-	sendMessage = (msg) => {
-		this.options.debug && debug('sendMessage', msg);
-		this.data = msg.toObject();
-	};
-
-	finishSend = () => {
-		try {
-			let { service, methodName } = this.options.methodDefinition;
-			const funcName = 'grpc.' + service.serviceName + '.' + methodName;
-			this.options.debug && debug('finishSend, call: ', funcName);
-			let callbackId = getNewID();
-			this.meta['callbackId'] = callbackId;
-			this.meta['windowId'] = (external as any).id;
-			const req = {
-				func: funcName,
-				args: this.data,
-				meta: this.meta,
-			};
-			pendingCall[callbackId] = (res) => {
-				this.options.onChunk(new this.responseType(res.body), true);
-				if (this.options.methodDefinition.responseStream) {
-					//
-				}
-				else {
-					//如果是单次调用，补上onEnd，并清空回调
-					this.options.onEnd();
-					delete pendingCall[callbackId];
-				}
-			};
-			this.sendMsg(JSON.stringify(req));
-		}
-		catch (e) {
-			console.log('rpc error', e);
-		}
-	};
-
-	start = (metadata) => {
-		//unary调用需要
-		this.headers.set('grpc-status', '0');
-		this.headers.set('grpc-message', 'OK');
-		this.options.onHeaders(this.headers, 200);
-
-		metadata.forEach((key, values) => {
-			this.meta[String(key)] = values;
-		});
-	};
-	cancel = () => {};
-}
+import { grpc } from '@improbable-eng/grpc-web';
+import { TransportOptions } from '@improbable-eng/grpc-web/dist/typings/transports/Transport';
+import { Metadata } from '@improbable-eng/grpc-web/dist/typings/metadata';
+
+let debug = console.log;
+let callbackId = 0;
+let pendingCall = {};
+
+function getNewID() {
+	let id = callbackId;
+	callbackId += 1;
+	return id.toString();
+}
+//接收调用返回值
+(window as any).onRPCMessage = function (msg) {
+	window.requestAnimationFrame(() => {
+		let res = JSON.parse(msg);
+		let func = pendingCall[res.meta.callbackId];
+		func(res);
+	});
+};
+
+export class LuaPixTransport implements grpc.Transport {
+	constructor(public options: TransportOptions) {
+		window.noProto = true;
+		options.debug && debug('LuaPixTransport', options);
+	}
+
+	headers = new grpc.Metadata();
+	sendMsg = (this.options as any).callFunc;
+	data;
+	responseType = this.options.methodDefinition.responseType.prototype.constructor;
+	meta = new Map<string, string>();
+
+	sendMessage = (msg) => {
+		this.options.debug && debug('sendMessage', msg);
+		this.data = msg.toObject();
+	};
+
+	finishSend = () => {
+		try {
+			let { service, methodName } = this.options.methodDefinition;
+			const funcName = 'grpc.' + service.serviceName + '.' + methodName;
+			this.options.debug && debug('finishSend, call: ', funcName);
+			let callbackId = getNewID();
+			this.meta['callbackId'] = callbackId;
+			this.meta['windowId'] = (external as any).id;
+			const req = {
+				func: funcName,
+				args: this.data,
+				meta: this.meta,
+			};
+			pendingCall[callbackId] = (res) => {
+				this.options.onChunk(new this.responseType(res.body), true);
+				if (this.options.methodDefinition.responseStream) {
+					//
+				}
+				else {
+					//如果是单次调用，补上onEnd，并清空回调
+					this.options.onEnd();
+					delete pendingCall[callbackId];
+				}
+			};
+			this.sendMsg(JSON.stringify(req));
+		}
+		catch (e) {
+			console.log('rpc error', e);
+		}
+	};
+
+	start = (metadata) => {
+		//unary调用需要
+		this.headers.set('grpc-status', '0');
+		this.headers.set('grpc-message', 'OK');
+		this.options.onHeaders(this.headers, 200);
+
+		metadata.forEach((key, values) => {
+			this.meta[String(key)] = values;
+		});
+	};
+	cancel = () => {};
+}