dcp-client 4.4.13 → 4.4.15

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.13",
+  "version": "4.4.15",
   "description": "Core libraries for accessing DCP network",
   "keywords": [
     "dcp"
@@ -9,6 +9,10 @@
   "bugs": {
     "url": "https://github.com/Distributed-Compute-Labs/dcp-client/issues"
   },
+  "dcp": {
+    "version": "379a3131205d78e903405b80ba03575479eece7b",
+    "repository": "git@gitlab.com:Distributed-Compute-Protocol/dcp.git"
+  },
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/Distributed-Compute-Labs/dcp-client.git"
@@ -22,7 +26,10 @@
   "scripts": {
     "build": "./build/bundle",
     "test": "npx peter tests",
-    "vtest": "npx peter -v tests"
+    "vtest": "npx peter -v tests",
+    "prepack": "npm-hooks/prepack",
+    "postpublish": "npm-hooks/postpublish",
+    "prepublishOnly": "npm-hooks/prepublish"
   },
   "dependencies": {
     "@kingsds/socket.io-client": "^4.5.4",

package/.tidelift

@@ -1,2 +0,0 @@
-TIDELIFT_ORGANIZATION=team/Distributive
-TIDELIFT_PROJECT=dcp-client

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 "$DOCS_DIR"/site
-
-rm -r "$DOCS_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/etc/deprecated-dcp-config.js

@@ -1,48 +0,0 @@
-/**
- * @file        dcp-config.js
- *              Bare-bones config for worker loaded. For use with localexec,
- *              or so the tree exists for 
- *
- * @author      Ryan Saweczko <ryan@kingsds.network>
- * @date        Sep 2022
- */
-
-return {
-  worker: {
-    /* Allow lists permitting supervisor network access beyond DCP messages to services */
-    allowOrigins: {
-      any: [],
-      fetchWorkFunctions: [],
-      fetchArguments: [],
-      fetchData: [],
-      sendResults: [],
-    },
-
-    minimumWage: {
-      CPU:  0,
-      GPU:  0,
-      'in': 0,
-      out:  0,
-    },
-
-    computeGroups: {},              // integer-one-indexed; format is 1:{ joinKey,joinHash } or 2:{ joinKey, joinSecret }
-    jobAddresses: [],               // Specific job addresses the worker may work on. If not empty, worker will only work on those jobs.
-    maxWorkingSandboxes: 1,
-    paymentAddress: null,    // user must to specify
-    evaluatorOptions: {}
-  },
-
-  standaloneWorker:
-  {
-    quiet: false,
-    debug: process.env.DCP_SAW_DEBUG,
-    evaluatorConnectBackoff:
-    {
-      maxInterval:   5 * 60 * 1000, // max: 5 minutes
-      baseInterval:      10 * 1000, // start: 10s
-      backoffFactor: 1.1            // each fail, back off by 10%
-    },
-    reloadBehaviour: 'process.exit(12)',
-  },
-}
-