dcp-client 4.3.1 → 4.3.2-webgpu.1

package/libexec/sandbox/access-lists.js

@@ -659,10 +659,9 @@ self.wrapScriptLoading({ scriptName: 'access-lists', ringTransition: true }, fun
    *
    * @param {object} obj - The object, which will have the allow list applied to its properties.
    * @param {Set} allowList - A set of properties to allow people to access.
-   * @param {Set} blockList - An object of property names mapping to booleans to indicate whether access is allowed or not.
-   * @param {Set} polyfills - An object of property names that have been polyfilled.
+   * @param {Object} blockList - An object of property names mapping to booleans to indicate whether access is allowed or not.
    */
-  function applyAccessLists(obj, allowList, blockList = {}, polyfills = {}) {
+  function applyAccessLists(obj, allowList, blockList = {}) {
     if (!obj) { return; }
     Object.getOwnPropertyNames(obj).forEach(function (prop) {
       if (Object.getOwnPropertyDescriptor(obj, prop).configurable) {
@@ -670,17 +669,13 @@ self.wrapScriptLoading({ scriptName: 'access-lists', ringTransition: true }, fun
           let isSet = false;
           let propValue;
           Object.defineProperty(obj, prop, {
-            get: function () {
-              if (isSet) {
+            get: function getProtectedProperty() {
+              if (isSet)
                 return propValue;
-              } else {
-                if (prop in polyfills) {
-                  return polyfills[prop];
-                }
+              else 
                 return undefined;
-              }
             },
-            set: function (value) {
+            set: function setProtectedProperty(value) {
               propValue = value;
               isSet = true;
             },
@@ -712,16 +707,17 @@ self.wrapScriptLoading({ scriptName: 'access-lists', ringTransition: true }, fun
 
   /**
    * Applies a list of polyfills to symbols not present in the global object. Will apply
-   * this list through the objects entire prototype chain
+   * check the prototype chain for the symbol, and add it to the supplied 'obj' only if not
+   * present in the chain.
    * 
    * @param {Object} obj - The global object to add properties on
-   * @param {Set} polyfills - An object of property names to create/polyfill 
+   * @param {Object} polyfills - An object of property names to create/polyfill 
    */
-  function applyPolyfills(obj, polyfills = {}) {
+  function applyPolyfills(obj, polyfills){
     // Apply symbols from polyfill object
     for (let prop in polyfills) {
       let found = false;
-      for (let o = obj; o.__proto__ && (o.__proto__ !== Object); o = o.__proto__) {
+      for (let o = obj; Object.getPrototypeOf(o); o = Object.getPrototypeOf(o)) {
         if (o.hasOwnProperty(prop)) {
           found = true;
           break;
@@ -730,11 +726,11 @@ self.wrapScriptLoading({ scriptName: 'access-lists', ringTransition: true }, fun
       if (found) { continue; }
       let propValue = polyfills[prop];
       Object.defineProperty(obj, prop, {
-        get: function () {
+        get: function getPolyfill() {
           return propValue;
 
         },
-        set: function (value) {
+        set: function setPolyfill(value) {
           propValue = value;
         },
         configurable: false
@@ -748,43 +744,25 @@ self.wrapScriptLoading({ scriptName: 'access-lists', ringTransition: true }, fun
    * so that the blockList is accessible to modify w/o adding it to the allowList.
    */
   function applyAllAccessLists() {
-    // We need to apply the access lists to global, global.__proto__, and global.__proto__.__proto__,
-    // because there's networking-accessing functions inside global.__proto__.__proto__, like fetch.
+    // We need to apply the access lists to global, and the entirety of global's prototype chain
+    // because there's networking-accessing functions inside the chain, like fetch.
     //
     // If we're in a robust environment (node, browser, WebWorker, basically anything but v8),
     // then we have to climb the prototype chain and apply the allowList there, but we have to stop
     // before we allow Object's properties
 
     var global = typeof globalThis === 'undefined' ? self : globalThis;
-
-    // Ternary expression to avoid a ReferenceError on navigator
-    let _GPU       = ((typeof navigator !== 'undefined') && (typeof navigator.gpu !== 'undefined')) ? navigator.gpu : 
-      (typeof GPU !== 'undefined'? GPU : undefined);
-
-    for (let g = global; g.__proto__ && (g.__proto__ !== Object); g = g.__proto__) {
+    for (let g = global; Object.getPrototypeOf(g); g = Object.getPrototypeOf(g))
       applyAccessLists(g, allowList, blockList, polyfills);
-    }
 
     if (typeof navigator === 'undefined')
+      navigator = { userAgent: 'not a browser', gpu: undefined };
+    else
     {
       navigator = {
-        userAgent: 'not a browser',
-        gpu: _GPU,
-      };
-    }
-    else if (!protectedStorage.createdNewNavigator)
-    {
-      // We also want to allowList certain parts of navigator, but not others.
-      const navAllowlist = new Set([
-        'userAgent',
-        'gpu',
-      ]);
-      let navPolyfill = {
-        userAgent: typeof navigator.userAgent !== 'undefined'? navigator.userAgent : 'not a browser',
-        gpu: _GPU,
+        userAgent:  navigator.userAgent ? navigator.userAgent : 'not a browser', 
+        gpu: navigator.gpu
       };
-      applyAccessLists(navigator.__proto__, navAllowlist, {}, {}, navPolyfill);
-      applyPolyfills(navigator.__proto__, navPolyfill);
     }
   }
 

package/libexec/sandbox/script-load-wrapper.js

@@ -83,9 +83,14 @@
         result: "success",
       });
 
-      if (options.finalScript)
+      if (options.finalScript) {
         delete self.wrapScriptLoading;
 
+        // The 'sandboxLoaded' event is used by dcp-native; do not remove.
+        ring0PostMessage({
+          request: 'sandboxLoaded', // SAVE
+        })
+      }
     } catch (e) {
       ring0PostMessage({
           request: 'scriptLoaded',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-client",
-  "version": "4.3.1",
+  "version": "4.3.2-webgpu.1",
   "description": "Core libraries for accessing DCP network",
   "keywords": [
     "dcp"
@@ -50,7 +50,6 @@
   },
   "devDependencies": {
     "@kingsds/eslint-config": "1.0.1",
-    "@techdocs/cli": "1.4.6",
     "eslint": "7.30.0",
     "express": "^4.18.2",
     "peter": "^2.3.11"

package/bin/publish-docs.sh

@@ -1,74 +0,0 @@
-#! /usr/bin/env bash
-#
-# @file         publish-docs.sh
-# @athor        Brandon Christie <brandon@distributive.network>
-# @date         Aug 2023
-#
-# @description  Publishes the docs for each component
-#               to backstage.
-
-set -euo pipefail
-
-cd "$(dirname "$0")/.."
-
-ROOT_DIR=$PWD
-
-echo "TechDocs Bucket Name: $TECHDOCS_S3_BUCKET_NAME"
-echo "Namespace: $ENTITY_NAMESPACE"
-
-ENTITY_KIND=$(yq ".kind" < catalog-info.yaml)
-echo "Kind: $ENTITY_KIND"
-
-ENTITY_NAME=$(yq ".metadata.name" < catalog-info.yaml)
-echo "Name: $ENTITY_NAME"
-
-TECHDOCS_REF=$(yq ".metadata.annotations.\"backstage.io/techdocs-ref\"" < catalog-info.yaml)
-echo "TechDocs Ref: $TECHDOCS_REF"
-
-# An example of the the techdocs-ref in the YAML file:
-# dir:./docs/dcp
-#
-# The Regex below will isolate the directory path giving the
-# result 'docs/dcp' for the given example.
-if [[ "$TECHDOCS_REF" =~ dir:\.(.*) ]]; then
-  RELATIVE_DOCS_DIR="${BASH_REMATCH[1]%%[[:space:]]*}"
-  DOCS_DIR="$ROOT_DIR/$RELATIVE_DOCS_DIR"
-fi
-
-# The techdocs-cli commands must be called in the directory where the
-# mkdocs.yml file is present.
-cd "$DOCS_DIR"
-
-# MkDocs requires an index.md or README.md file, if one does not exist it will
-# be generated automatically.
-if ! [ -f index.md ] && ! [ -f README.md ]; then
-  if [ -z "$CI" ]; then  
-    AUTHOR="$(git config user.name) <$(git config user.email)>"
-  else  
-    AUTHOR="$CI_COMMIT_AUTHOR"
-  fi  
-
-  echo "README.md or index.md was not found and will be automatically generated."  
-  cat >> index.md <<EOF
-<!--
-@author  $AUTHOR
-@date    $(date)
-@machine $HOSTNAME
-@rev     $(git rev-parse HEAD)
--->
-> **Warning**: MkDocs requires a top level index.md or README.md (case sensitive)
-This index.md file has been generated automatically to ensure MkDocs works correctly
-EOF
-fi
-
-npx techdocs-cli generate --no-docker --verbose
-
-npx techdocs-cli publish \
-  --publisher-type awsS3 \
-  --storage-name "$TECHDOCS_S3_BUCKET_NAME" \
-  --entity "$ENTITY_NAMESPACE"/"$ENTITY_KIND"/"$ENTITY_NAME" \
-  --directory "$ROOT_DIR"/site
-
-rm -r "$ROOT_DIR"/site
-
-echo "View generated component: https://backstage.overwatch.distributive.network/docs/default/component/$ENTITY_NAME"

package/catalog-info.yaml

@@ -1,21 +0,0 @@
-# @file         catalog-info.yml
-# @author       Brandon Christie <brandon@distributive.network>
-# @date         Mar 2023
-#
-# @description  Lists all of the components and the paths to all
-#               the documentation that will be published to backstage.
-
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: dcp-client
-  description: Documentation for the dcp-client.
-  tags:
-    - documentation
-  annotations:
-    gitlab.com/project-id: '9874684'
-    backstage.io/techdocs-ref: dir:./docs
-spec:
-  type: library
-  lifecycle: production
-  owner: core

package/docs/mkdocs.yml

@@ -1,16 +0,0 @@
-# @file         mkdocs.yml
-# @author       Brandon Christie <brandon@distributive.network>
-# @date         Aug 2023
-#
-# @description  Determines how the component of name: 'dcp-client'
-#               is formatted on backstage.
-
-site_name: dcp-client
-repo_url: https://gitlab.com/Distributed-Compute-Protocol/dcp-client
-edit_uri: edit/develop/docs
-docs_dir: .
-nav:
-  - README.md
-plugins:
-  - techdocs-core
-  - same-dir