Merge pull request #138 from Distributive-Network/Xmader/feat/py-datetime-to-js

Feat: Support converting Python datetime objects to JS Date

Author: zollqir

include/DateType.hh

@@ -26,8 +26,19 @@
 struct DateType : public PyType {
 public:
   DateType(PyObject *object);
-  DateType(JSContext *cx, JS::Handle<JSObject *> dateObj);
+  /**
+   * @brief Convert a JS Date object to Python datetime
+   */
+  DateType(JSContext *cx, JS::HandleObject dateObj);
+
   const TYPE returnType = TYPE::DATE;
+
+  /**
+   * @brief Convert a Python datetime object to JS Date
+   *
+   * @param cx - javascript context pointer
+   */
+  JSObject *toJsDate(JSContext *cx);
 };
 
 #endif

src/DateType.cc

@@ -11,7 +11,7 @@
 
 DateType::DateType(PyObject *object) : PyType(object) {}
 
-DateType::DateType(JSContext *cx, JS::Handle<JSObject *> dateObj) {
+DateType::DateType(JSContext *cx, JS::HandleObject dateObj) {
   JS::Rooted<JS::ValueArray<0>> args(cx);
   JS::Rooted<JS::Value> year(cx);
   JS::Rooted<JS::Value> month(cx);
@@ -33,4 +33,12 @@ DateType::DateType(JSContext *cx, JS::Handle<JSObject *> dateObj) {
     year.toNumber(), month.toNumber() + 1, day.toNumber(),
     hour.toNumber(), minute.toNumber(), second.toNumber(),
     usecond.toNumber() * 1000);
-}
+}
+
+JSObject *DateType::toJsDate(JSContext *cx) {
+  // See https://docs.python.org/3/library/datetime.html#datetime.datetime.timestamp
+  PyObject *timestamp = PyObject_CallMethod(pyObject, "timestamp", NULL); // the result is in seconds
+  double milliseconds = PyFloat_AsDouble(timestamp) * 1000;
+  Py_DECREF(timestamp);
+  return JS::NewDateObject(cx, JS::TimeClip(milliseconds));
+}

src/jsTypeFactory.cc

@@ -20,6 +20,7 @@
 #include "include/StrType.hh"
 #include "include/IntType.hh"
 #include "include/PromiseType.hh"
+#include "include/DateType.hh"
 #include "include/ExceptionType.hh"
 #include "include/BufferType.hh"
 
@@ -28,6 +29,7 @@
 #include <js/Proxy.h>
 
 #include <Python.h>
+#include <datetime.h> // https://docs.python.org/3/c-api/datetime.html
 
 #define HIGH_SURROGATE_START 0xD800
 #define LOW_SURROGATE_START 0xDC00
@@ -65,6 +67,8 @@ size_t UCS4ToUTF16(const uint32_t *chars, size_t length, uint16_t **outStr) {
 }
 
 JS::Value jsTypeFactory(JSContext *cx, PyObject *object) {
+  PyDateTime_IMPORT; // for PyDateTime_Check
+
   JS::RootedValue returnType(cx);
 
   if (PyBool_Check(object)) {
@@ -145,6 +149,10 @@ JS::Value jsTypeFactory(JSContext *cx, PyObject *object) {
     JSObject *error = ExceptionType(object).toJsError(cx);
     returnType.setObject(*error);
   }
+  else if (PyDateTime_Check(object)) {
+    JSObject *dateObj = DateType(object).toJsDate(cx);
+    returnType.setObject(*dateObj);
+  }
   else if (PyObject_CheckBuffer(object)) {
     BufferType *pmBuffer = new BufferType(object);
     JSObject *typedArray = pmBuffer->toJsTypedArray(cx); // may return null

src/modules/pythonmonkey/pythonmonkey.cc

@@ -375,7 +375,7 @@ static bool clearTimeout(JSContext *cx, unsigned argc, JS::Value *vp) {
   // Retrieve the AsyncHandle by `timeoutID`
   int32_t timeoutID = timeoutIdArg.toInt32();
   AsyncHandle *handle = AsyncHandle::fromId((uint32_t)timeoutID);
-  if (!handle) return true;   // does nothing on invalid timeoutID
+  if (!handle) return true; // does nothing on invalid timeoutID
 
   // Cancel this job on Python event-loop
   handle->cancel();