dcp-client 5.4.0 → 5.4.2

package/build/all

@@ -11,5 +11,6 @@ fi
 
 cd "$oldDir"
 "${myDir}/generate-sandbox-definitions-json"
+"${myDir}/generate-worktimes-json"
 echo
 "${myDir}/bundle" "$@"

package/build/generate-sandbox-definitions-json

@@ -15,9 +15,11 @@ const path = require('path');
 
 var o = {};
 const target = '../generated/sandbox-definitions.json';
-console.log(`Generating sandbox definitions in ${target}`);
+if (!process.env.CONSOLE_RESULTS)
+  console.log(`Generating sandbox definitions in ${target}`);
 
 /** All sandbox types use the base files */
+const worktimes = ['pyodide-worktime', 'map-basic-worktime'];
 const base = [
   'script-load-wrapper',
   'timer-classes',
@@ -26,7 +28,6 @@ const base = [
   'lift-webgl',
   'lift-wasm',
   'lift-webgpu',
-  'worktimes',
   'url',
   'polyfills',
   'access-lists',
@@ -34,7 +35,9 @@ const base = [
   'bravojs-init',
   'bravojs/bravo.js',
   'bravojs-env',
+  'worktimes',
   'pyodide-core',
+  ...worktimes,
   'calculate-capabilities',
 ];
 
@@ -62,5 +65,13 @@ o.nodeTesting = o.node.concat(['testing.js']);
  */
 o.testing = o.native.concat(['testing.js']);
 
-fs.writeFileSync(path.resolve(__dirname, target), JSON.stringify(o), 'utf-8');
-console.log(`Done - ${Object.keys(o).join(', ')}.`);
+/** Distinguish worktime scripts to allow for the scheduler to run them and acquire their version */
+o.worktimes = worktimes;
+
+if (process.env.CONSOLE_RESULTS)
+  console.log(JSON.stringify(o))
+else
+{
+  fs.writeFileSync(path.resolve(__dirname, target), JSON.stringify(o), 'utf-8');
+  console.log(`Done - ${Object.keys(o).join(', ')}.`);
+}

package/build/generate-worktimes-json

@@ -0,0 +1,41 @@
+#! /usr/bin/env node
+/**
+ *  @file       generate-worktimes-json
+ *              Source of authority for worktimes and their versions this dcp-client version supports
+ *
+ *  @author     Severn Lortie <severn@distributive.network>
+ *              Ryan Saweczko <ryansaweczko@distributive.network>
+ *  @date       February 2024
+ *              December 2025
+ */
+'use strict';
+
+const fs   = require('fs');
+const path = require('path');
+const semver = require('semver');
+
+const worktimeScripts = require('../generated/sandbox-definitions.json').worktimes;
+const worktimes = [];
+function wrapScriptLoading(_, fn)
+{
+  fn(protectedStorage);
+}
+function registerWorktime(worktime)
+{
+  worktimes.push({ name: worktime.name, version: worktime.version })
+}
+const protectedStorage = {};
+protectedStorage.worktimes = {};
+protectedStorage.worktimes.registerWorktime = registerWorktime;
+globalThis.self = {};
+globalThis.self.wrapScriptLoading = wrapScriptLoading;
+for (const script of worktimeScripts)
+  require(`../libexec/sandbox/${script}`);
+worktimes.sort((a, b) => semver.compare(b.version, a.version, true));
+
+
+const target = '../generated/worktimes.json';
+if (process.env.CONSOLE_RESULTS)
+  console.log(JSON.stringify(worktimes))
+else
+  fs.writeFileSync(path.resolve(__dirname, target), JSON.stringify(worktimes), 'utf-8');