dcp-client 4.3.1 → 4.3.2-webgpu.0

package/generated/sandbox-definitions.json

@@ -1 +1 @@
-{"browser":["deny-node","kvin/kvin.js","script-load-wrapper","wrap-event-listeners","timer-classes","event-loop-virtualization","unique-timing","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"node":["kvin/kvin.js","sa-ww-simulation","script-load-wrapper","wrap-event-listeners","timer-classes","event-loop-virtualization","unique-timing","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"native":["deny-node","kvin/kvin.js","sa-ww-simulation","script-load-wrapper","native-event-loop","wrap-event-listeners","timer-classes","event-loop-virtualization","unique-timing","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"webGpuNative":["deny-node","kvin/kvin.js","sa-ww-simulation","script-load-wrapper","native-event-loop","wrap-event-listeners","timer-classes","webgpu-worker-environment","event-loop-virtualization","unique-timing","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"nodeTesting":["kvin/kvin.js","sa-ww-simulation","script-load-wrapper","wrap-event-listeners","timer-classes","event-loop-virtualization","unique-timing","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap","testing.js"],"testing":["deny-node","kvin/kvin.js","sa-ww-simulation","script-load-wrapper","native-event-loop","wrap-event-listeners","timer-classes","event-loop-virtualization","unique-timing","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap","testing.js"]}
+{"browser":["deny-node","kvin/kvin.js","script-load-wrapper","wrap-event-listeners","timer-classes","event-loop-virtualization","unique-timing","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"node":["kvin/kvin.js","sa-ww-simulation","script-load-wrapper","wrap-event-listeners","timer-classes","event-loop-virtualization","unique-timing","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"native":["deny-node","kvin/kvin.js","sa-ww-simulation","script-load-wrapper","native-event-loop","wrap-event-listeners","timer-classes","event-loop-virtualization","unique-timing","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"nodeTesting":["kvin/kvin.js","sa-ww-simulation","script-load-wrapper","wrap-event-listeners","timer-classes","event-loop-virtualization","unique-timing","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap","testing.js"],"testing":["deny-node","kvin/kvin.js","sa-ww-simulation","script-load-wrapper","native-event-loop","wrap-event-listeners","timer-classes","event-loop-virtualization","unique-timing","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap","testing.js"]}

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/calculate-capabilities.js

@@ -49,28 +49,13 @@ self.wrapScriptLoading({ scriptName: 'calculate-capabilities' }, function calcul
       });`
 
       webgpu =
-        typeof GPU !== 'undefined' ||
         (typeof navigator !== 'undefined' &&
           typeof navigator.gpu !== 'undefined');
 
       if (webgpu) {
         try {
-          // if we're in a standalone, we need to initialize a window before requesting adapter
-          // These symbols will have to be updated as the webGPU spec keeps updating and as we update our evaluator
-          if (typeof WebGPUWindow !== 'undefined') {
-            const gpuWindow = new WebGPUWindow({
-              width: 640,
-              height: 480,
-              title: 'DCP-evaluator',
-              visible: false,
-            });
-            
-            const adapter = await GPU.requestAdapter({ window: gpuWindow });
-            await adapter.requestDevice(adapter.extensions);
-          } else {
-            const adapter = await navigator.gpu.requestAdapter();
-            await adapter.requestDevice();
-          }
+          const adapter = await navigator.gpu.requestAdapter();
+          await adapter.requestDevice();
         } catch (err) {
           // if glfw fails or the symbols exist but webgpu hasn't been
           // properly enabled (mozilla)
@@ -119,7 +104,7 @@ self.wrapScriptLoading({ scriptName: 'calculate-capabilities' }, function calcul
       }
 
       if(eval(testCode)(1) !== 1)
-        useStrict = false;      
+        useStrict = false;
 
       return {
         engine: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-client",
-  "version": "4.3.1",
+  "version": "4.3.2-webgpu.0",
   "description": "Core libraries for accessing DCP network",
   "keywords": [
     "dcp"

package/libexec/sandbox/webgpu-worker-environment.js

@@ -1,122 +0,0 @@
-/**
- *  @file       libexec/sandbox/webgpu-worker-environment.js
- *  @author     Dominic Cerisano, dcerisano@kingsds.network
- *  @date       May 2020
- *  @author     Jason Erb, jason@kingsds.network
- *  @date       February 2022
- *  @note       Adapted from:
- *              https://github.com/Kings-Distributed-Systems/webgpu/blob/dcp/release/index.js
- */
-
-self.wrapScriptLoading({ scriptName: 'webgpu-evaluator' }, function webGpuWorkerEnvironment$$fn(protectedStorage, postMessage)
-{
-  if (typeof GPU !== 'undefined') {
-    try {
-      if (typeof self.navigator === 'undefined')
-      {
-        self.navigator = {};
-        protectedStorage.createdNewNavigator = true;
-      }
-      self.navigator.gpu = GPU;
-
-      {
-        let devices = [];
-
-        //Timeouts for polyfills
-        //Negative numbers to signal clamping override in evaluator engine.
-        //nextTickTimeout is for process.nextTick() polyfill
-        //immediateTimeout is for setImmediate() polyfill
-
-        self.nextTickTimeout  = -0;
-        self.immediateTimeout = -0;
-
-        function deviceTick()
-        {
-          if (devices) {
-            for (let ii = 0; ii < devices.length; ++ii) {
-              devices[ii].tick();
-            };
-          }
-        }
-
-        self.setTimeout(deviceTick, self.nextTickTimeout);
-
-        GPUAdapter.prototype.requestDevice = function() {
-          let args = arguments;
-
-          return new Promise((resolve, reject) => {
-            this._requestDevice(...args).then(device => {
-              device._onErrorCallback = function(type, msg) {
-                //Polyfill for process.nextTick
-                self.setTimeout(() => {
-                  switch (type) {
-                  case "Error": throw new Error(msg);
-                  case "Type": throw new TypeError(msg);
-                  case "Range": throw new RangeError(msg);
-                  case "Reference": throw new ReferenceError(msg);
-                  case "Internal": throw new InternalError(msg);
-                  case "Syntax": throw new SyntaxError(msg);
-                  default: throw new Error(msg);
-                  };
-                }, self.immediateTimeout);
-              };
-
-              devices.push(device);
-              resolve(device);
-            });
-          });
-        };
-      }
-
-      //Return a promise instead of a callback
-
-      GPUFence.prototype.onCompletion = function(completionValue) {
-        return new Promise(resolve => {
-          //Polyfill for setImmediate
-          self.setTimeout(() => {
-            this._onCompletion(completionValue, resolve);
-          }, self.immediateTimeout);
-        });
-      };
-
-      GPUBuffer.prototype.mapReadAsync = function() {
-        return new Promise(resolve => {
-          //Polyfill for setImmediate
-          self.setTimeout(() => {
-            this._mapReadAsync(resolve);
-          }, self.immediateTimeout);
-        });
-      };
-
-      GPUBuffer.prototype.mapWriteAsync = function() {
-        return new Promise(resolve => {
-          //Polyfill for setImmediate
-          self.setTimeout(() => {
-            this._mapWriteAsync(resolve);
-          }, self.immediateTimeout);
-        });
-      };
-
-      GPUDevice.prototype.createBufferMappedAsync = function(descriptor) {
-        return new Promise(resolve => {
-          //Polyfill for setImmediate
-          self.setTimeout(() => {
-            this._createBufferMappedAsync(descriptor, resolve);
-          }, self.immediateTimeout);
-        });
-      };
-
-      GPUDevice.prototype.createBufferMapped = function(descriptor) {
-        return new Promise(resolve => {
-          //Polyfill for setImmediate
-          self.setTimeout(() => {
-            this._createBufferMapped(descriptor, resolve);
-          }, self.immediateTimeout);
-        });
-      };
-
-    } catch (err) {
-      console.log("ERROR: ", err);
-    }
-  }
-});