dcp-client 4.4.14 → 4.4.16

package/libexec/sandbox/bootstrap.js

@@ -186,7 +186,25 @@ self.wrapScriptLoading({ scriptName: 'bootstrap', finalScript: true }, function
    * `protectedStorage.dispatchSameConsoleMessage()` for the events triggering
    * their dispatch.
    */
+  const consoleBuffer = [];
+  protectedStorage.emitConsoleMessages = false;
+
   function workerBootstrap$console(level, ...args)
+  {
+    consoleBuffer.push({ level, args });
+    if (protectedStorage.emitConsoleMessages)
+      workerBootstrap$flushConsole()
+  }
+
+  protectedStorage.flushConsoleBuffer = workerBootstrap$flushConsole;
+  function workerBootstrap$flushConsole()
+  {
+    for (let console of consoleBuffer)
+      workerBootstrap$emitConsole(console.level, console.args);
+    consoleBuffer.length = 0;
+  }
+
+  function workerBootstrap$emitConsole(level, args)
   {
     const newConsoleLog = { level, message: args };
 

package/libexec/sandbox/bravojs-env.js

@@ -398,6 +398,8 @@ prepPyodide`);
     var rejection = false;
     var result;
     let metrics;
+    protectedStorage.emitConsoleMessages = true;
+    protectedStorage.flushConsoleBuffer();
     try
     {
       /* module.main.job is the work function; left by assign message */ 
@@ -408,9 +410,6 @@ prepPyodide`);
       rejection = error;
     }
 
-
-    // flush any pending console events, especially in the case of a repeating message that hasn't been emitted yet 
-    try { protectedStorage.dispatchSameConsoleMessage(); } catch(e) {};
     try {
       // reset the device states and flush all pending tasks
       protectedStorage.lockTimers(); // lock timers so no new timeouts will be run.
@@ -421,6 +420,11 @@ prepPyodide`);
       // only the microtask could trigger new code, so waiting for a setTimeout guarantees everything's done
       await new Promise((r) => protectedStorage.realSetTimeout.call(globalThis, r, 1));
 
+      // flush any pending console events, especially in the case of a repeating message that hasn't been emitted yet 
+      // then, disable emission of any more console messages
+      try { protectedStorage.dispatchSameConsoleMessage(); } catch(e) {};
+      protectedStorage.emitConsoleMessages = false;
+
       metrics = await protectedStorage.bigBrother.globalTrackers.getMetrics();
 
       await protectedStorage.bigBrother.globalTrackers.reset();

package/npm-hooks/postpublish

@@ -0,0 +1,11 @@
+#! /bin/bash
+#
+# @file         post-publish
+#               Hook which tags the package in git with the package version
+#               as it gets published.
+# @author       Wes Garland, wes@distributive.network
+# @date         Nov 2022
+#
+cd `dirname "$0"`/..
+PACKAGE_VERSION=$(cat package.json | egrep '^\s*"version":' | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]')
+git tag v$PACKAGE_VERSION && git push --tags

package/npm-hooks/prepack

@@ -0,0 +1,53 @@
+#! /bin/bash
+# @file        prepack
+#              Hook which generates the bundle on pack (or publish), and ensures that we only publish
+#              release packages.
+# @author      Wes Garland, wes@distributive.network
+# @date        Oct 2024
+
+set -e
+cd `dirname "$0"`/..
+DCP_VERSION=$(node -p "require('./package').dcp.version")
+
+if [ $(git rev-parse --abbrev-ref HEAD) != "release" ]; then
+  BUILD_TYPE="debug"
+else
+  BUILD_TYPE="release"
+fi
+
+if [ ! -d node_modules ]; then
+  echo "node_modules missing; please run npm ci before packing" >&2
+  exit 1
+fi
+
+if [ ! "${NPM_PREPACK_SKIP_BUNDLE_REBUILD}" ]; then
+  if ! [ -d .dcp-build ]; then
+    git clone --filter=blob:none $(node -p "require('./package').dcp.repository") .dcp-build
+  else
+    git fetch
+  fi
+
+  (
+    for var in $(compgen -e | grep '^npm_')
+    do
+      eval unset ${var}
+    done
+    set > /tmp/q
+    cd .dcp-build
+    git checkout "$DCP_VERSION"
+    ./configure.sh --with-build="${BUILD_TYPE}" --disable-evaluator
+    npm ci
+    cd ..
+    build/bundle --no-cache --dcp=.dcp-build --build="${BUILD_TYPE}"
+  )
+fi
+
+if [ "${DCP_VERSION}" != $(node -r ./index -p "require('dcp/build').version") ]; then
+  echo "Bundle built from wrong version of DCP repo!" >&2
+  exit 1
+fi
+
+if [ $(node -r ./index -p "require('dcp/build').config.build") != "${BUILD_TYPE}" ]; then
+  echo "Bundle is not a ${BUILD_TYPE} build!" >&2
+  exit 1
+fi

package/npm-hooks/prepublish

@@ -0,0 +1,49 @@
+#! /bin/bash
+#
+# @file         pre-publish
+#               Hook which prevents package publishing if the repository
+#               isn't in a nice, clean state.
+# @author       Wes Garland, wes@distributive.network
+# @date         Nov 2022
+#
+cd `dirname "$0"`/..
+
+yellow='\e[33m'
+normal='\e[0m'
+
+git ls-files --error-unmatch `find . -type f | egrep -v '^\./(node_modules|\.git|\.dcp-build|build)'` >/dev/null
+if [ "$?" != "0" ]; then
+  echo
+  echo -e "${yellow}pre-publish: abort due to files in package which aren't in repo${normal}" >/dev/stderr
+  echo
+  exit 1
+fi
+
+(git status --porcelain; echo DONE DONE) \
+| egrep -v '^ M dist/' \
+| while read status filename
+  do
+    case "$status" in
+      "M")
+        echo "${filename} is not checked in"
+        EXITCODE=1
+      ;;
+      "DONE")
+         exit $EXITCODE
+      ;;
+      *)
+      ;;
+    esac
+  done
+if [ "$?" != "0" ]; then
+  echo
+  echo -e "${yellow}pre-publish: abort due to modified files${normal}" >/dev/stderr
+  echo
+  exit 1
+fi
+
+if [ $(git rev-parse --abbrev-ref HEAD) != "release" ]; then
+  echo "${yellow}pre-publish: this is not the release branch!" >&2
+  exit 1
+fi
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-client",
-  "version": "4.4.14",
+  "version": "4.4.16",
   "description": "Core libraries for accessing DCP network",
   "keywords": [
     "dcp"