teraslice 1.7.2 → 2.0.0

package/cluster-service.js

@@ -41,7 +41,7 @@ class Service {
 }
 
 async function main() {
-    const context = makeTerafoundationContext();
+    const context = await makeTerafoundationContext();
     const cmd = new Service(context);
 
     cmd.shutdownHandler = shutdownHandler(context, () => {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "teraslice",
     "displayName": "Teraslice",
-    "version": "1.7.2",
+    "version": "2.0.0",
     "description": "Distributed computing platform for processing JSON data",
     "homepage": "https://github.com/terascope/teraslice#readme",
     "bugs": {
@@ -25,13 +25,13 @@
         "build": "tsc --build",
         "build:watch": "yarn build --watch",
         "start": "node service.js",
-        "test": "TEST_ELASTICSEARCH='true' ts-scripts test . --",
-        "test:debug": "TEST_ELASTICSEARCH='true' ts-scripts test --debug . --",
-        "test:elasticsearch6": "TEST_ELASTICSEARCH='true' ts-scripts test . --",
-        "test:elasticsearch7": "TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='7.9.3' ts-scripts test . --",
-        "test:opensearch1": "TEST_OPENSEARCH='true' ts-scripts test . --",
-        "test:opensearch2": "TEST_OPENSEARCH='true' OPENSEARCH_VERSION='2.8.0' ts-scripts test . --",
-        "test:watch": "TEST_ELASTICSEARCH='true' ts-scripts test --watch . --"
+        "test": "NODE_OPTIONS='--experimental-vm-modules' TEST_ELASTICSEARCH='true' ts-scripts test . --",
+        "test:debug": "NODE_OPTIONS='--experimental-vm-modules' TEST_ELASTICSEARCH='true' ts-scripts test --debug . --",
+        "test:elasticsearch6": "NODE_OPTIONS='--experimental-vm-modules' TEST_ELASTICSEARCH='true' ts-scripts test . --",
+        "test:elasticsearch7": "NODE_OPTIONS='--experimental-vm-modules' TEST_ELASTICSEARCH='true' ELASTICSEARCH_VERSION='7.9.3' ts-scripts test . --",
+        "test:opensearch1": "NODE_OPTIONS='--experimental-vm-modules' TEST_OPENSEARCH='true' ts-scripts test . --",
+        "test:opensearch2": "NODE_OPTIONS='--experimental-vm-modules' TEST_OPENSEARCH='true' OPENSEARCH_VERSION='2.8.0' ts-scripts test . --",
+        "test:watch": "NODE_OPTIONS='--experimental-vm-modules' TEST_ELASTICSEARCH='true' ts-scripts test --watch . --"
     },
     "resolutions": {
         "debug": "^4.3.4",
@@ -39,14 +39,13 @@
     },
     "dependencies": {
         "@terascope/elasticsearch-api": "^3.20.2",
-        "@terascope/job-components": "^0.75.1",
-        "@terascope/teraslice-messaging": "^0.42.2",
+        "@terascope/job-components": "^1.0.0",
+        "@terascope/teraslice-messaging": "^1.0.0",
         "@terascope/types": "^0.17.2",
         "@terascope/utils": "^0.59.2",
         "async-mutex": "^0.5.0",
         "barbe": "^3.0.16",
         "body-parser": "^1.20.2",
-        "convict": "^6.2.4",
         "decompress": "^4.2.1",
         "easy-table": "^1.2.0",
         "event-loop-stats": "^1.4.1",
@@ -61,10 +60,10 @@
         "ms": "^2.1.3",
         "nanoid": "^3.3.4",
         "porty": "^3.1.1",
-        "semver": "^7.6.1",
+        "semver": "^7.6.2",
         "socket.io": "^1.7.4",
         "socket.io-client": "^1.7.4",
-        "terafoundation": "^0.64.1",
+        "terafoundation": "^1.0.0",
         "uuid": "^9.0.1"
     },
     "devDependencies": {
@@ -74,7 +73,9 @@
         "archiver": "^7.0.1",
         "bufferstreams": "^3.0.0",
         "chance": "^1.1.11",
-        "got": "^11.8.3",
+        "convict": "^6.2.4",
+        "convict-format-with-moment": "^6.2.0",
+        "convict-format-with-validator": "^6.2.0",
         "jest-fixtures": "^0.6.0",
         "js-yaml": "^4.1.0",
         "nock": "^13.5.1"

package/service.js

@@ -42,7 +42,7 @@ if (['execution_controller', 'worker'].includes(assignment)) {
         },
     });
 
-    new ClusterContext(terasliceConfig);
+    await ClusterContext.createContext(terasliceConfig);
 }
 
 function deprecatedUseOf(name) {

package/worker-service.js

@@ -7,12 +7,10 @@ import { makeExecutionContext } from './dist/src/lib/workers/context/execution-c
 import { makeTerafoundationContext } from './dist/src/lib/workers/context/terafoundation-context.js';
 import { ExecutionController } from './dist/src/lib/workers/execution-controller/index.js';
 import { Worker } from './dist/src/lib/workers/worker/index.js';
-import { getPackageJSON } from './dist/src/lib/utils/file_utils.js';
 
 class Service {
     constructor(context) {
         this.executionConfig = this._getExecutionConfigFromEnv();
-        this.executionConfig.teraslice_version = getPackageJSON().version;
         this.context = context;
 
         this.logger = this.context.logger;
@@ -69,16 +67,22 @@ class Service {
     }
 }
 
-const context = makeTerafoundationContext();
-const cmd = new Service(context);
+async function main() {
+    const context = await makeTerafoundationContext();
+    const cmd = new Service(context);
 
-cmd.shutdownHandler = shutdownHandler(context, (event, err) => {
-    if (!cmd.instance) return Promise.resolve();
-    return cmd.instance.shutdown(true, event, err);
-});
+    cmd.shutdownHandler = shutdownHandler(context, (event, err) => {
+        if (!cmd.instance) return Promise.resolve();
+        return cmd.instance.shutdown(true, event, err);
+    });
 
-Promise.resolve()
-    .then(() => cmd.initialize())
-    .then(() => cmd.run())
-    .then(() => cmd.shutdown())
-    .catch((err) => cmd.shutdown(err));
+    try {
+        await cmd.initialize();
+        await cmd.run();
+        await cmd.shutdown();
+    } catch (err) {
+        cmd.shutdown(err);
+    }
+}
+
+main();