Merge branch 'main' into Xmader/fix/xhr-poll-error

Author: philippedistributive

.github/workflows/test-and-publish.yaml

@@ -59,8 +59,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Use Ubuntu 20.04 / macOS 13 x86_64 / macOS 14 arm64 + Python 3.10 to build SpiderMonkey
-        os: [ 'ubuntu-20.04', 'macos-13', 'macos-14' ] # macOS 14 runner exclusively runs on M1 hardwares
+        # Use Ubuntu 20.04 / Ubuntu 24.04 / macOS 13 x86_64 / macOS 14 arm64 + Python 3.10 to build SpiderMonkey
+        os: [ 'ubuntu-20.04', 'ubuntu-24.04', 'macos-13', 'macos-14' ] # macOS 14 runner exclusively runs on M1 hardwares
                                                        # see https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available
         python_version: [ '3.10' ]
     runs-on: ${{ matrix.os }}
@@ -81,8 +81,7 @@ jobs:
           lookup-only: true # skip download
       - name: Setup XCode
         if: ${{ (matrix.os == 'macos-13' || matrix.os == 'macos-14') && steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
-        # SpiderMonkey 115 ESR requires XCode SDK version at least 13.3
-        # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#installed-sdks
+        # SpiderMonkey requires XCode SDK version at least 13.3
         run: sudo xcode-select -switch /Applications/Xcode_14.3.app
       - name: Build spidermonkey
         if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
@@ -128,8 +127,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # The lowest supported version is Ubuntu 20.04 + Python 3.8 or macOS 12 + Python 3.9
-        os: [ 'ubuntu-20.04', 'macos-12', 'macos-14', 'windows-2022' ]
+        os: [ 'ubuntu-20.04', 'ubuntu-24.04', 'macos-12', 'macos-14', 'windows-2022' ]
         python_version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
         exclude:
           # actions/setup-python: The version '3.8'/'3.9' with architecture 'arm64' was not found for macOS.
@@ -274,6 +272,19 @@ jobs:
         with:
           name: wheel-${{ github.run_id }}-${{ github.sha }}
           path: ./dist/
+  check-install-from-sdist:
+    needs: sdist
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: Download wheels built
+        uses: actions/download-artifact@v3
+        with:
+          name: wheel-${{ github.run_id }}-${{ github.sha }}
+          path: ./dist/
+      - run: pip install ./dist/pythonmonkey-*.tar.gz
   publish:
     needs: [build-and-test, sdist]
     runs-on: ubuntu-20.04

.github/workflows/update-mozcentral-version.yaml

@@ -24,15 +24,16 @@ jobs:
             jq --join-output '(.lastpushid | tostring) as $pushid | empty, .pushes[$pushid].changesets[0]'
           )
           echo "MOZCENTRAL_VERSION=$COMMIT_HASH" >> $GITHUB_ENV
+          echo "MOZCENTRAL_VERSION_SHORT=${COMMIT_HASH:0:7}" >> $GITHUB_ENV
       - name: Update `mozcentral.version` File
-        run: echo $MOZCENTRAL_VERSION > mozcentral.version
+        run: echo -n $MOZCENTRAL_VERSION > mozcentral.version
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v6
         with:
           add-paths: mozcentral.version
           commit-message: |
             chore(deps): upgrade SpiderMonkey to `${{ env.MOZCENTRAL_VERSION }}`
-          branch: chore/upgrade-spidermonkey-to-${{ env.MOZCENTRAL_VERSION }}
+          branch: chore/upgrade-spidermonkey-to-${{ env.MOZCENTRAL_VERSION_SHORT }}
           title: Upgrade SpiderMonkey to mozilla-central commit `${{ env.MOZCENTRAL_VERSION }}`
           body: |
             Changeset: https://hg.mozilla.org/mozilla-central/rev/${{ env.MOZCENTRAL_VERSION }}

include/JSStringProxy.hh

@@ -36,6 +36,35 @@ public:
    * @param self - The JSStringProxy to be free'd
    */
   static void JSStringProxy_dealloc(JSStringProxy *self);
+
+   /**
+   * @brief copy protocol method for both copy and deepcopy
+   *
+   * @param self - The JSObjectProxy
+   * @return a copy of the string
+   */
+  static PyObject *JSStringProxy_copy_method(JSStringProxy *self);
+};
+
+// docs for methods, copied from cpython
+PyDoc_STRVAR(stringproxy_deepcopy__doc__,
+  "__deepcopy__($self, memo, /)\n"
+"--\n"
+"\n");
+
+PyDoc_STRVAR(stringproxy_copy__doc__,
+"__copy__($self, /)\n"
+"--\n"
+"\n");
+
+/**
+ * @brief Struct for the other methods
+ *
+ */
+static PyMethodDef JSStringProxy_methods[] = {
+  {"__deepcopy__", (PyCFunction)JSStringProxyMethodDefinitions::JSStringProxy_copy_method, METH_O, stringproxy_deepcopy__doc__}, // ignores any memo argument
+  {"__copy__", (PyCFunction)JSStringProxyMethodDefinitions::JSStringProxy_copy_method, METH_NOARGS, stringproxy_copy__doc__},
+  {NULL, NULL}                  /* sentinel */
 };
 
 /**

include/JobQueue.hh

@@ -79,7 +79,7 @@ void runJobs(JSContext *cx) override;
 bool empty() const override;
 
 /**
- * @return true if the job queue stops draining, which results in `empty()` being false after `runJobs()`.
+ * @return true if the job queue stopped draining, which results in `empty()` being false after `runJobs()`.
  */
 bool isDrainingStopped() const override;
 

include/PyBaseProxyHandler.hh

@@ -30,7 +30,7 @@ public:
   bool isExtensible(JSContext *cx, JS::HandleObject proxy, bool *extensible) const override final;
 };
 
-enum ProxySlots {PyObjectSlot};
+enum ProxySlots {PyObjectSlot, OtherSlot};
 
 typedef struct {
   const char *name;      /* The name of the method */

include/PyBytesProxyHandler.hh

@@ -0,0 +1,57 @@
+/**
+ * @file PyBytesProxyHandler.hh
+ * @author Philippe Laporte ([email protected])
+ * @brief Struct for creating JS Uint8Array-like proxy objects for immutable bytes objects
+ * @date 2024-07-23
+ *
+ * @copyright Copyright (c) 2024 Distributive Corp.
+ *
+ */
+
+#ifndef PythonMonkey_PyBytesProxy_
+#define PythonMonkey_PyBytesProxy_
+
+
+#include "include/PyObjectProxyHandler.hh"
+
+
+/**
+ * @brief This struct is the ProxyHandler for JS Proxy Iterable pythonmonkey creates to handle coercion from python iterables to JS Objects
+ *
+ */
+struct PyBytesProxyHandler : public PyObjectProxyHandler {
+public:
+  PyBytesProxyHandler() : PyObjectProxyHandler(&family) {};
+  static const char family;
+
+   /**
+   * @brief [[Set]]
+   *
+   * @param cx pointer to JSContext
+   * @param proxy The proxy object who's property we wish to set
+   * @param id Key of the property we wish to set
+   * @param v Value that we wish to set the property to
+   * @param receiver The `this` value to use when executing any code
+   * @param result whether or not the call succeeded
+   * @return true call succeed
+   * @return false call failed and an exception has been raised
+   */
+  bool set(JSContext *cx, JS::HandleObject proxy, JS::HandleId id,
+    JS::HandleValue v, JS::HandleValue receiver,
+    JS::ObjectOpResult &result) const override;
+
+  bool getOwnPropertyDescriptor(
+    JSContext *cx, JS::HandleObject proxy, JS::HandleId id,
+    JS::MutableHandle<mozilla::Maybe<JS::PropertyDescriptor>> desc
+  ) const override;  
+
+  /**
+   * @brief Handles python object reference count when JS Proxy object is finalized
+   *
+   * @param gcx pointer to JS::GCContext
+   * @param proxy the proxy object being finalized
+   */
+  void finalize(JS::GCContext *gcx, JSObject *proxy) const override;
+};
+
+#endif

include/PyIterableProxyHandler.hh

@@ -28,12 +28,6 @@ public:
     JSContext *cx, JS::HandleObject proxy, JS::HandleId id,
     JS::MutableHandle<mozilla::Maybe<JS::PropertyDescriptor>> desc
   ) const override;
-
-  /**
-   * @brief An array of method definitions for Iterable prototype methods
-   *
-   */
-  static JSMethodDef iterable_methods[];
 };
 
 #endif

include/PyObjectProxyHandler.hh

@@ -190,12 +190,6 @@ public:
     JS::ObjectOpResult &result) const override;
 
   bool getBuiltinClass(JSContext *cx, JS::HandleObject proxy, js::ESClass *cls) const override;
-
-  /**
-   * @brief An array of method definitions for Object prototype methods
-   *
-   */
-  static JSMethodDef object_methods[];
 };
 
 #endif

include/StrType.hh

@@ -37,6 +37,8 @@ public:
   static PyObject *getPyObject(JSContext *cx, JS::HandleValue str);
 
   static const char *getValue(JSContext *cx, JS::HandleValue str);
+
+  static PyObject *proxifyString(JSContext *cx, JS::HandleValue str);
 };
 
 #endif

mozcentral.version

@@ -1 +1 @@
-d25c9bdacb64ae50779dc91f5919ca0189ad6c36
+bc4609b7aa7a3dff961f43d527bc66c5c85f6f4b