Fix sending dates through the protocol

Fixes #253.

Author: code-asher

packages/protocol/src/browser/modules/fs.ts

@@ -317,17 +317,7 @@ export class FsModule {
 }
 
 class Stats implements fs.Stats {
-	public readonly atime: Date;
-	public readonly mtime: Date;
-	public readonly ctime: Date;
-	public readonly birthtime: Date;
-
-	public constructor(private readonly stats: IStats) {
-		this.atime = new Date(stats.atime);
-		this.mtime = new Date(stats.mtime);
-		this.ctime = new Date(stats.ctime);
-		this.birthtime = new Date(stats.birthtime);
-	}
+	public constructor(private readonly stats: IStats) {}
 
 	public get dev(): number { return this.stats.dev; }
 	public get ino(): number { return this.stats.ino; }
@@ -339,6 +329,10 @@ class Stats implements fs.Stats {
 	public get size(): number { return this.stats.size; }
 	public get blksize(): number { return this.stats.blksize; }
 	public get blocks(): number { return this.stats.blocks; }
+	public get atime(): Date { return this.stats.atime; }
+	public get mtime(): Date { return this.stats.mtime; }
+	public get ctime(): Date { return this.stats.ctime; }
+	public get birthtime(): Date { return this.stats.birthtime; }
 	public get atimeMs(): number { return this.stats.atimeMs; }
 	public get mtimeMs(): number { return this.stats.mtimeMs; }
 	public get ctimeMs(): number { return this.stats.ctimeMs; }

packages/protocol/src/common/util.ts

@@ -65,6 +65,11 @@ export const argumentToProto = (
 			const arg = new Argument.ProxyValue();
 			arg.setId(storeProxy(currentValue));
 			message.setProxy(arg);
+		} else if (currentValue instanceof Date
+			|| (currentValue && typeof currentValue.getTime === "function")) {
+			const arg = new Argument.DateValue();
+			arg.setDate(currentValue.toString());
+			message.setDate(arg);
 		} else if (currentValue !== null && typeof currentValue === "object") {
 			const arg = new Argument.ObjectValue();
 			const map = arg.getDataMap();
@@ -136,6 +141,8 @@ export const protoToArgument = (
 				}
 
 				return createProxy(currentMessage.getProxy()!.getId());
+			case Argument.MsgCase.DATE:
+				return new Date(currentMessage.getDate()!.getDate());
 			case Argument.MsgCase.OBJECT:
 				const obj: { [Key: string]: any } = {};
 				currentMessage.getObject()!.getDataMap().forEach((argument, key) => {

packages/protocol/src/node/modules/fs.ts

@@ -24,10 +24,10 @@ export interface Stats {
 	mtimeMs: number;
 	ctimeMs: number;
 	birthtimeMs: number;
-	atime: Date | string;
-	mtime: Date | string;
-	ctime: Date | string;
-	birthtime: Date | string;
+	atime: Date;
+	mtime: Date;
+	ctime: Date;
+	birthtime: Date;
 	_isFile: boolean;
 	_isDirectory: boolean;
 	_isBlockDevice: boolean;

packages/protocol/src/node/server.ts

@@ -317,6 +317,7 @@ export class Server {
 		logger.trace(() => [
 			"sending reject",
 			field("id", id) ,
+			field("message", error.message),
 		]);
 
 		const failedMessage = new Method.Fail();

packages/protocol/src/proto/node.proto

@@ -40,6 +40,10 @@ message Argument {
 
 	message UndefinedValue {}
 
+	message DateValue {
+		string date = 1;
+	}
+
 	oneof msg {
 		ErrorValue error = 1;
 		BufferValue buffer = 2;
@@ -52,6 +56,7 @@ message Argument {
 		double number = 9;
 		string string = 10;
 		bool boolean = 11;
+		DateValue date = 12;
 	}
 }
 

packages/protocol/src/proto/node_pb.d.ts

@@ -59,6 +59,11 @@ export class Argument extends jspb.Message {
   getBoolean(): boolean;
   setBoolean(value: boolean): void;
 
+  hasDate(): boolean;
+  clearDate(): void;
+  getDate(): Argument.DateValue | undefined;
+  setDate(value?: Argument.DateValue): void;
+
   getMsgCase(): Argument.MsgCase;
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): Argument.AsObject;
@@ -83,6 +88,7 @@ export namespace Argument {
     number: number,
     string: string,
     pb_boolean: boolean,
+    date?: Argument.DateValue.AsObject,
   }
 
   export class ErrorValue extends jspb.Message {
@@ -248,6 +254,26 @@ export namespace Argument {
     }
   }
 
+  export class DateValue extends jspb.Message {
+    getDate(): string;
+    setDate(value: string): void;
+
+    serializeBinary(): Uint8Array;
+    toObject(includeInstance?: boolean): DateValue.AsObject;
+    static toObject(includeInstance: boolean, msg: DateValue): DateValue.AsObject;
+    static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
+    static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
+    static serializeBinaryToWriter(message: DateValue, writer: jspb.BinaryWriter): void;
+    static deserializeBinary(bytes: Uint8Array): DateValue;
+    static deserializeBinaryFromReader(message: DateValue, reader: jspb.BinaryReader): DateValue;
+  }
+
+  export namespace DateValue {
+    export type AsObject = {
+      date: string,
+    }
+  }
+
   export enum MsgCase {
     MSG_NOT_SET = 0,
     ERROR = 1,
@@ -261,6 +287,7 @@ export namespace Argument {
     NUMBER = 9,
     STRING = 10,
     BOOLEAN = 11,
+    DATE = 12,
   }
 }