[VET-5931] Upgrade Stardog.js to node 22

.circleci/config.yml

@@ -1,65 +1,42 @@
-# This config is based partially on one that was auto-generated by CircleCI
-# from our 1.0 config. Some stuff may be superfluous.
-version: 2
+version: 2.1
 
-references:
-  working_directory: &working_directory ~/stardog-union/stardog.js
+orbs:
+  node: circleci/node@7
 
-jobs:
-  build:
-    working_directory: *working_directory
-    shell: /bin/bash --login
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+executors:
+  machine:
     machine:
       docker_layer_caching: true
-    steps:
-    - checkout
-    # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
-    # These steps could be consolidated, but I left them separate since that was what was generated.
-    - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
-    - run:
-        working_directory: *working_directory
-        command: echo $LICENSE | base64 --decode > ./stardog-license-key.bin
-    - run:
-        working_directory: *working_directory
-        command: docker login -u $ARTIFACTORY_USERNAME -p $ARTIFACTORY_PASSWORD stardog-eps-docker.jfrog.io
-    - run:
-        working_directory: *working_directory
-        command: docker build -t this/here/starduck ./
-    - run:
-        working_directory: *working_directory
-        command: docker run --name stargoose -p 127.0.0.1:5820:5820 -d -it this/here/starduck
-    # Dependencies
-    # Restore the dependency cache
-    - restore_cache:
-        keys:
-        # This branch if available
-        - v1-dep-{{ .Branch }}-{{ checksum "package-lock.json" }}
-        # Default branch if not
-        - v1-dep-master-{{ checksum "package-lock.json" }}
-        # Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
-        - v1-dep-{{ checksum "package-lock.json" }}
-    - run: if [ -z "${NODE_ENV:-}" ]; then export NODE_ENV=test; fi
-    - run: npm install
-    # Save dependency cache
-    - save_cache:
-        key: v1-dep-{{ .Branch }}-{{ checksum "package-lock.json" }}
-        paths:
-        - ./node_modules
-    # Test
-    #   This would typically be a build job when using workflows, possibly combined with build
-    - run: docker ps -a
-    - run: docker logs stargoose
-    - run: npm test
-    # Teardown
-    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
-    # Save test results
-    - store_test_results:
-        path: /tmp/circleci-test-results
-    # Save artifacts
-    - store_artifacts:
-        path: /tmp/circleci-artifacts
-    - store_artifacts:
-        path: /tmp/circleci-test-results
+      image: ubuntu-2204:current
+
+workflows:
+  build_and_test:
+    jobs:
+      - node/test:
+          name: Test with Node.js 22
+          executor: machine
+          pkg-manager: yarn
+          setup:
+            - node/install:
+                install-yarn: true
+                node-version: '22'
+            - run:
+                name: Build and run docker container
+                command: |
+                  echo "$LICENSE" | base64 --decode > ./stardog-license-key.bin
+                  docker login -u "$ARTIFACTORY_USERNAME" -p "$ARTIFACTORY_PASSWORD" stardog-eps-docker.jfrog.io
+                  docker build -t this/here/starduck ./
+                  docker run --name stargoose -p 127.0.0.1:5820:5820 -d -it this/here/starduck
+          post_install_steps:
+            - run:
+                name: Wait for Stardog server to be ready
+                command: yarn run wait-for-server
+      - node/run:
+          name: Build with Node.js 22
+          executor: machine
+          pkg-manager: yarn
+          yarn-run: build
+          setup:
+            - node/install:
+                install-yarn: true
+                node-version: '22'

.circleci/docker-compose.yml

@@ -3,71 +3,70 @@ services:
   stardog1:
     command: ["--port", "5821", "--home", "/var/opt/stardog"]
     depends_on:
-    - zoo1
+      - zoo1
     environment:
       STARDOG_SERVER_JAVA_ARGS: -Xms2g -Xmx2g -XX:MaxDirectMemorySize=1g
       THIS_HOST: stardog1
       THIS_PORT: 5821
       ZK_HOST_PORT: zoo1:2181
     image: stardog/stardog:latest
     ports:
-    - 5821:5821
+      - 5821:5821
     restart: always
     privileged: true
     volumes:
-    - ../stardog-license-key.bin:/var/opt/stardog/stardog-license-key.bin
-    - ./cluster.properties:/var/opt/stardog/stardog.properties
+      - ../stardog-license-key.bin:/var/opt/stardog/stardog-license-key.bin
+      - ./cluster.properties:/var/opt/stardog/stardog.properties
   stardog2:
     command: ["--port", "5822", "--home", "/var/opt/stardog"]
     depends_on:
-    - zoo1
+      - zoo1
     environment:
       STARDOG_SERVER_JAVA_ARGS: -Xms2g -Xmx2g -XX:MaxDirectMemorySize=1g
       THIS_HOST: stardog2
       THIS_PORT: 5822
       ZK_HOST_PORT: zoo1:2181
     image: stardog/stardog:latest
     ports:
-    - 5822:5822
+      - 5822:5822
     restart: always
     privileged: true
     volumes:
-    - ../stardog-license-key.bin:/var/opt/stardog/stardog-license-key.bin
-    - ./cluster.properties:/var/opt/stardog/stardog.properties
+      - ../stardog-license-key.bin:/var/opt/stardog/stardog-license-key.bin
+      - ./cluster.properties:/var/opt/stardog/stardog.properties
   stardog3:
     image: stardog/stardog:latest
     ports:
-    - 5820:5820
+      - 5820:5820
     restart: always
     privileged: true
     volumes:
-    - ../stardog-license-key.bin:/var/opt/stardog/stardog-license-key.bin
-    - ../test/fixtures/:/var/opt/stardog/test/fixtures/
-    - ./token.properties:/var/opt/stardog/stardog.properties
-    - ./jwt.yaml:/var/opt/stardog/jwt.yaml
+      - ../stardog-license-key.bin:/var/opt/stardog/stardog-license-key.bin
+      - ../test/fixtures/:/var/opt/stardog/test/fixtures/
+      - ./token.properties:/var/opt/stardog/stardog.properties
+      - ./jwt.yaml:/var/opt/stardog/jwt.yaml
   zoo1:
     environment:
       ZOO_MY_ID: 1
       ZOO_SERVERS: server.1=zoo1:2888:3888
     image: zookeeper:3.4.14
     ports:
-    - 2181
+      - 2181
     restart: always
 
   test-unit:
-    image: circleci/node:carbon-stretch
+    image: node:22
     command: npm test
     working_dir: /app
     volumes:
       - ../:/app/
     environment:
       - HOST=stardog3
-      - CIRCLECI=true
     depends_on:
       - stardog3
 
   test-cluster:
-    image: circleci/node:carbon-stretch
+    image: node:22
     command: npm test:cluster
     working_dir: /app
     environment:

.eslintrc.js

@@ -0,0 +1,36 @@
+/** @type {import('eslint').Linter.BaseConfig} */
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 'latest',
+  },
+  plugins: ['prettier'],
+  extends: [
+    'airbnb-base',
+    'prettier',
+    'plugin:jest/recommended',
+    '@blueprintjs/eslint-config',
+    'plugin:prettier/recommended',
+  ],
+  rules: {
+    curly: ['warn', 'all'],
+    'header/header': 'off',
+    'import/no-mutable-exports': 'off',
+    'import/order': 'off',
+    'import/prefer-default-export': 'off',
+    'jest/expect-expect': ['warn', { assertFunctionNames: ['expect*'] }],
+    'jsx-a11y/anchor-is-valid': 'off',
+    'jsx-a11y/click-events-have-key-events': 'off',
+    'no-console': 'warn',
+    'no-return-await': 'off',
+    'no-underscore-dangle': 'off',
+    'object-curly-spacing': 'error',
+    'prettier/prettier': 'warn',
+    radix: 'off',
+    'sort-imports': 'off',
+
+    // TODO remove these:
+    'no-unused-vars': 'off',
+    'prefer-object-spread': 'warn',
+  },
+};

.nvmrc

@@ -1 +1 @@
-lts/carbon
+22

jest.config.cluster.js

@@ -0,0 +1,5 @@
+/** @type {import('jest').Config} */
+module.exports = {
+  setupFilesAfterEnv: ['./jest.setup.js'],
+  testRegex: 'test/cluster/.+\\.spec\\.js$',
+};

jest.config.js

@@ -1,3 +1,6 @@
+/** @type {import('jest').Config} */
 module.exports = {
-  setupTestFrameworkScriptFile: './jest.setup.js',
+  setupFilesAfterEnv: ['./jest.setup.js'],
+  // don't include subdirs, so we ignore test/cluster/*
+  testRegex: 'test/[^/]+\\.spec\\.js$',
 };

lib/Connection.js

@@ -1,4 +1,3 @@
-const { Headers, Request } = require('./fetch');
 const base64 = require('isomorphic-base64');
 
 class Connection {

lib/catalog.js

@@ -1,5 +1,3 @@
-const { fetch } = require('./fetch');
-
 const { httpBody } = require('./response-transforms');
 
 const status = conn => {

lib/cluster.js

@@ -1,4 +1,3 @@
-const { fetch } = require('./fetch');
 const { httpBody } = require('./response-transforms');
 
 const info = conn => {

lib/dataSources.js

@@ -1,7 +1,5 @@
-const { fetch } = require('./fetch');
-const qs = require('querystring');
-
 const { httpBody } = require('./response-transforms');
+const { encodeURIComponentsWithQuestionMark } = require('./utils');
 
 const list = conn => {
   const headers = conn.headers();
@@ -59,13 +57,18 @@ const update = (conn, name, options, requestOptions = {}) => {
 
 const remove = (conn, name, params = {}) => {
   const headers = conn.headers();
-  const queryParams = Object.keys(params).length
-    ? `?${qs.stringify(params)}`
-    : '';
-  return fetch(conn.request('admin', 'data_sources', `${name}${queryParams}`), {
-    method: 'DELETE',
-    headers,
-  }).then(httpBody);
+
+  return fetch(
+    conn.request(
+      'admin',
+      'data_sources',
+      `${name}${encodeURIComponentsWithQuestionMark(params)}`
+    ),
+    {
+      method: 'DELETE',
+      headers,
+    }
+  ).then(httpBody);
 };
 
 const share = (conn, name) => {

lib/db/docs.js

@@ -1,6 +1,3 @@
-const FormData = require('form-data');
-const { fetch } = require('../fetch');
-
 const { httpBody } = require('../response-transforms');
 
 const size = (conn, database, params = {}) => {
@@ -23,15 +20,7 @@ const clear = (conn, database, params = {}) => {
 const add = (conn, database, fileName, fileContents, params = {}) => {
   const headers = conn.headers();
   const formData = new FormData();
-  formData.append('upload', Buffer.from(fileContents), {
-    filename: fileName,
-  });
-  // Copy over formData headers, since node-fetch 2+ apparently doesn't do this
-  // automatically. See: https://github.com/bitinn/node-fetch/issues/368
-  const formDataHeaders = formData.getHeaders();
-  Object.keys(formDataHeaders).forEach(key => {
-    headers.set(key, formDataHeaders[key]);
-  });
+  formData.append('upload', new Blob([fileContents]), fileName);
   return fetch(conn.request(database, 'docs'), {
     method: 'POST',
     body: formData,