terafoundation 0.64.0 → 1.0.0

package/dist/src/cluster-context.js

@@ -1,51 +1,20 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClusterContext = void 0;
-const cluster_1 = __importDefault(require("cluster"));
-const ts = __importStar(require("@terascope/utils"));
-const sysconfig_1 = require("./sysconfig");
-const validate_configs_1 = __importDefault(require("./validate-configs"));
-const core_context_1 = require("./core-context");
-const master_1 = __importDefault(require("./master"));
-const cluster = cluster_1.default;
+import _cluster from 'node:cluster';
+import { get, isFunction, getFullErrorStack } from '@terascope/utils';
+import { getArgs } from './sysconfig.js';
+import validateConfigs from './validate-configs.js';
+import { CoreContext, handleStdStreams } from './core-context.js';
+import master from './master.js';
+const cluster = _cluster;
 // this module is not really testable
 /* istanbul ignore next */
 /**
  * A Cluster Context (with worker processes), useful for scaling
 */
-class ClusterContext extends core_context_1.CoreContext {
-    constructor(config) {
-        const parsedArgs = (0, sysconfig_1.getArgs)(config.default_config_file);
-        const sysconfig = (0, validate_configs_1.default)(cluster, config, parsedArgs.configfile);
+export class ClusterContext extends CoreContext {
+    constructor(config, sysconfig) {
         super(config, cluster, sysconfig);
         this._errorHandler = this._errorHandler.bind(this);
-        (0, core_context_1.handleStdStreams)();
+        handleStdStreams();
         process.on('uncaughtException', this._errorHandler);
         process.on('unhandledRejection', this._errorHandler);
         if (config.script) {
@@ -58,8 +27,8 @@ class ClusterContext extends core_context_1.CoreContext {
             /**
              * Use cluster to start multiple workers
              */
-            (0, master_1.default)(this, config);
-            if (ts.isFunction(config.master)) {
+            master(this, config);
+            if (isFunction(config.master)) {
                 config.master(this, config);
             }
         }
@@ -91,16 +60,20 @@ class ClusterContext extends core_context_1.CoreContext {
             ? this.logger.error.bind(this.logger)
             : console.error;
         if (cluster.isMaster) {
-            logErr(ts.getFullErrorStack(err), `Error in master with pid: ${process.pid}`);
+            logErr(getFullErrorStack(err), `Error in master with pid: ${process.pid}`);
         }
         else {
-            logErr(ts.getFullErrorStack(err), `Error in worker: ${ts.get(this.cluster, 'worker.id')} pid: ${process.pid}`);
+            logErr(getFullErrorStack(err), `Error in worker: ${get(this.cluster, 'worker.id')} pid: ${process.pid}`);
         }
         // log saving to disk is async, using hack to give time to flush
         setTimeout(() => {
             process.exit(-1);
         }, 600);
     }
+    static async createContext(config) {
+        const parsedArgs = await getArgs(config.default_config_file);
+        const sysconfig = await validateConfigs(cluster, config, parsedArgs.configfile);
+        return new ClusterContext(config, sysconfig);
+    }
 }
-exports.ClusterContext = ClusterContext;
 //# sourceMappingURL=cluster-context.js.map

package/dist/src/cluster-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"cluster-context.js","sourceRoot":"","sources":["../../src/cluster-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cluster-context.js","sourceRoot":"","sources":["../../src/cluster-context.ts"],"names":[],"mappings":"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"}

package/dist/src/connector-utils.d.ts

@@ -1,7 +1,6 @@
 import { Logger } from '@terascope/utils';
-import { Terafoundation } from '@terascope/types';
-export declare function getConnectorModule(name: string, reason: string): any;
-export declare function getConnectorSchemaAndValFn<S>(name: string): Terafoundation.Initializers<S>;
-export declare function createConnection(name: string, moduleConfig: Record<string, any>, logger: Logger, options: Record<string, any>): any;
-export declare function createClient(name: string, moduleConfig: Record<string, any>, logger: Logger, options: Record<string, any>): Promise<any>;
+import type { Terafoundation } from '@terascope/types';
+export declare function getConnectorModule<S = Record<string, any>>(name: string, reason: string): Promise<Terafoundation.Connector<S> | null>;
+export declare function getConnectorSchemaAndValFn<S>(name: string): Promise<Terafoundation.Initializers<S>>;
+export declare function createClient(name: string, moduleConfig: Record<string, any>, logger: Logger, options: Record<string, any>): Promise<Terafoundation.ConnectorOutput>;
 //# sourceMappingURL=connector-utils.d.ts.map

package/dist/src/connector-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connector-utils.d.ts","sourceRoot":"","sources":["../../src/connector-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AA8DlD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,CA0CpE;AAED,wBAAgB,0BAA0B,CAAC,CAAC,EACxC,IAAI,EAAE,MAAM,GACb,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAShC;AAED,wBAAgB,gBAAgB,CAC5B,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC9F,GAAG,CASL;AAED,wBAAsB,YAAY,CAC9B,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,gBAUhG"}
+{"version":3,"file":"connector-utils.d.ts","sourceRoot":"","sources":["../../src/connector-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAqFvD,wBAAsB,kBAAkB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5D,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CA2C7C;AAED,wBAAsB,0BAA0B,CAAC,CAAC,EAC9C,IAAI,EAAE,MAAM,GACb,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAWzC;AAED,wBAAsB,YAAY,CAC9B,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,2CAUhG"}

package/dist/src/connector-utils.js

@@ -1,17 +1,25 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createClient = exports.createConnection = exports.getConnectorSchemaAndValFn = exports.getConnectorModule = void 0;
-const path_1 = __importDefault(require("path"));
-const utils_1 = require("@terascope/utils");
-function requireConnector(filePath, errors) {
-    let mod = require(filePath);
-    if (mod && mod.default) {
-        mod = mod.default;
-    }
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { TSError, parseError } from '@terascope/utils';
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+const pathFragments = dirname.split('/');
+const terafoundationPathIndex = pathFragments.findIndex((name) => name === 'terafoundation') + 1;
+const builtinConnectorPath = pathFragments.slice(0, terafoundationPathIndex).concat(['dist', 'src', 'connectors']).join('/');
+async function requireConnector(filePath, errors) {
     let valid = true;
+    let mod;
+    try {
+        mod = await import(filePath);
+        if (mod && mod.default) {
+            mod = mod.default;
+            if (mod.default) {
+                mod = mod.default;
+            }
+        }
+    }
+    catch (err) {
+        valid = false;
+    }
     if (typeof mod !== 'object') {
         valid = false;
     }
@@ -29,60 +37,58 @@ function requireConnector(filePath, errors) {
         });
         valid = false;
     }
-    if (mod && typeof mod.create !== 'function') {
+    if (mod && typeof mod.createClient !== 'function') {
         errors.push({
             filePath,
-            message: `Connector ${filePath} missing required create function`
+            message: `Connector ${filePath} missing required createClient function`
         });
         valid = false;
     }
-    if (valid)
+    if (valid) {
         return mod;
+    }
     return null;
 }
-function guardedRequire(filePath, errors) {
+async function guardedRequire(filePath, errors) {
     try {
         return requireConnector(filePath, errors);
     }
     catch (error) {
-        if (error.code === 'MODULE_NOT_FOUND') {
-            return false;
-        }
         errors.push({
             filePath,
-            message: (0, utils_1.parseError)(error, true),
+            message: parseError(error, true),
         });
         return null;
     }
 }
-function getConnectorModule(name, reason) {
+export async function getConnectorModule(name, reason) {
     let mod;
     // collect the errors
     const errors = [];
-    const localPath = path_1.default.join(__dirname, 'connectors', name);
-    mod = guardedRequire(localPath, errors);
+    const localPath = `${path.join(builtinConnectorPath, name)}.js`;
+    mod = await guardedRequire(localPath, errors);
     // check if its a node module
     if (!mod) {
-        mod = guardedRequire(name, errors);
+        mod = await guardedRequire(name, errors);
     }
     // Still not found check for a connector with underscores
     if (!mod) {
-        mod = guardedRequire(`terafoundation_${name}_connector`, errors);
+        mod = await guardedRequire(`terafoundation_${name}_connector`, errors);
     }
     // Still not found check for a connector with dashes
     if (!mod) {
-        mod = guardedRequire(`terafoundation-${name}-connector`, errors);
+        mod = await guardedRequire(`terafoundation-${name}-connector`, errors);
     }
     // Stil not found check for the @terascope namespace
     if (!mod) {
-        mod = guardedRequire(`@terascope/${name}`, errors);
+        mod = await guardedRequire(`@terascope/${name}`, errors);
     }
     if (mod)
         return mod;
     if (errors.length) {
         const filePaths = errors.map(({ filePath }) => filePath);
         const messages = errors.map(({ message }) => message);
-        throw new utils_1.TSError(messages.join(', caused by '), {
+        throw new TSError(messages.join(', caused by '), {
             reason,
             context: {
                 filePaths,
@@ -91,33 +97,21 @@ function getConnectorModule(name, reason) {
     }
     return null;
 }
-exports.getConnectorModule = getConnectorModule;
-function getConnectorSchemaAndValFn(name) {
+export async function getConnectorSchemaAndValFn(name) {
     const reason = `Could not retrieve schema code for: ${name}\n`;
-    const mod = getConnectorModule(name, reason);
+    const mod = await getConnectorModule(name, reason);
     if (!mod) {
         console.warn(`[WARNING] ${reason}`);
         return { schema: {} };
     }
     return { schema: mod.config_schema(), validatorFn: mod.validate_config };
 }
-exports.getConnectorSchemaAndValFn = getConnectorSchemaAndValFn;
-function createConnection(name, moduleConfig, logger, options) {
-    const reason = `Could not find connector implementation for: ${name}\n`;
-    const mod = getConnectorModule(name, reason);
-    if (!mod) {
-        throw new Error(reason);
-    }
-    return mod.create(moduleConfig, logger, options);
-}
-exports.createConnection = createConnection;
-async function createClient(name, moduleConfig, logger, options) {
+export async function createClient(name, moduleConfig, logger, options) {
     const reason = `Could not find connector implementation for: ${name}\n`;
-    const mod = getConnectorModule(name, reason);
+    const mod = await getConnectorModule(name, reason);
     if (!mod) {
         throw new Error(reason);
     }
     return mod.createClient(moduleConfig, logger, options);
 }
-exports.createClient = createClient;
 //# sourceMappingURL=connector-utils.js.map

package/dist/src/connector-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"connector-utils.js","sourceRoot":"","sources":["../../src/connector-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connector-utils.js","sourceRoot":"","sources":["../../src/connector-utils.ts"],"names":[],"mappings":"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"}

package/dist/src/connectors/elasticsearch-next.d.ts

@@ -1,11 +1,4 @@
-import { Logger } from '@terascope/utils';
-declare const _default: {
-    create(): never;
-    createClient(customConfig: Record<string, any>, logger: Logger): Promise<{
-        log: () => Logger;
-        client: import("elasticsearch-store").Client;
-    }>;
-    config_schema(): Record<string, any>;
-};
-export default _default;
+import type { Terafoundation } from '@terascope/types';
+declare const connector: Terafoundation.Connector;
+export default connector;
 //# sourceMappingURL=elasticsearch-next.d.ts.map

package/dist/src/connectors/elasticsearch-next.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"elasticsearch-next.d.ts","sourceRoot":"","sources":["../../../src/connectors/elasticsearch-next.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;;;+BAML,OAAO,MAAM,EAAE,GAAG,CAAC,UAAU,MAAM;;;;qBAGnD,OAAO,MAAM,EAAE,GAAG,CAAC;;AAPxC,wBAgCE"}
+{"version":3,"file":"elasticsearch-next.d.ts","sourceRoot":"","sources":["../../../src/connectors/elasticsearch-next.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGvD,QAAA,MAAM,SAAS,EAAE,cAAc,CAAC,SA8B/B,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/src/connectors/elasticsearch-next.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const elasticsearch_store_1 = require("elasticsearch-store");
-exports.default = {
-    create() {
-        throw new Error('elasticsearch-next does not support the deprecated "create" method');
-    },
+import { createClient as esCreateClient } from 'elasticsearch-store';
+const connector = {
     async createClient(customConfig, logger) {
-        return (0, elasticsearch_store_1.createClient)(customConfig, logger);
+        const { client, log } = await esCreateClient(customConfig, logger);
+        return { client, logger: log() };
     },
     config_schema() {
         return {
@@ -34,4 +30,5 @@ exports.default = {
         };
     }
 };
+export default connector;
 //# sourceMappingURL=elasticsearch-next.js.map

package/dist/src/connectors/elasticsearch-next.js.map

@@ -1 +1 @@
-{"version":3,"file":"elasticsearch-next.js","sourceRoot":"","sources":["../../../src/connectors/elasticsearch-next.ts"],"names":[],"mappings":";;AAAA,6DAAmD;AAGnD,kBAAe;IACX,MAAM;QACF,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;IAC1F,CAAC;IACD,KAAK,CAAC,YAAY,CAAC,YAAiC,EAAE,MAAc;QAChE,OAAO,IAAA,kCAAY,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IACD,aAAa;QACT,OAAO;YACH,IAAI,EAAE;gBACF,GAAG,EAAE,+BAA+B;gBACpC,OAAO,EAAE,CAAC,uBAAuB,CAAC;aACrC;YACD,YAAY,EAAE;gBACV,GAAG,EAAE,yBAAyB;gBAC9B,OAAO,EAAE,KAAK;aACjB;YACD,sBAAsB,EAAE;gBACpB,GAAG,EAAE,mCAAmC;gBACxC,OAAO,EAAE,KAAK;aACjB;YACD,cAAc,EAAE;gBACZ,GAAG,EAAE,iBAAiB;gBACtB,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,UAAU;aACrB;YACD,UAAU,EAAE;gBACR,GAAG,EAAE,sCAAsC;gBAC3C,OAAO,EAAE,CAAC;aACb;SACJ,CAAC;IACN,CAAC;CACJ,CAAC"}
+{"version":3,"file":"elasticsearch-next.js","sourceRoot":"","sources":["../../../src/connectors/elasticsearch-next.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErE,MAAM,SAAS,GAA6B;IACxC,KAAK,CAAC,YAAY,CAAC,YAAiC,EAAE,MAAc;QAChE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACnE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC;IACrC,CAAC;IACD,aAAa;QACT,OAAO;YACH,IAAI,EAAE;gBACF,GAAG,EAAE,+BAA+B;gBACpC,OAAO,EAAE,CAAC,uBAAuB,CAAC;aACrC;YACD,YAAY,EAAE;gBACV,GAAG,EAAE,yBAAyB;gBAC9B,OAAO,EAAE,KAAK;aACjB;YACD,sBAAsB,EAAE;gBACpB,GAAG,EAAE,mCAAmC;gBACxC,OAAO,EAAE,KAAK;aACjB;YACD,cAAc,EAAE;gBACZ,GAAG,EAAE,iBAAiB;gBACtB,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,UAAU;aACrB;YACD,UAAU,EAAE;gBACR,GAAG,EAAE,sCAAsC;gBAC3C,OAAO,EAAE,CAAC;aACb;SACJ,CAAC;IACN,CAAC;CACJ,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/src/connectors/hdfs.d.ts

@@ -1,10 +1,4 @@
-import { Logger } from '@terascope/utils';
-declare function create(customConfig: Record<string, any>, logger: Logger): {
-    client: any;
-};
-declare const _default: {
-    create: typeof create;
-    config_schema(): Record<string, any>;
-};
-export default _default;
+import type { Terafoundation } from '@terascope/types';
+declare const connector: Terafoundation.Connector;
+export default connector;
 //# sourceMappingURL=hdfs.d.ts.map

package/dist/src/connectors/hdfs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hdfs.d.ts","sourceRoot":"","sources":["../../../src/connectors/hdfs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,iBAAS,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG;IAChE,MAAM,EAAE,GAAG,CAAC;CACf,CAUA;;;qBAIoB,OAAO,MAAM,EAAE,GAAG,CAAC;;AAFxC,wBAsBE"}
+{"version":3,"file":"hdfs.d.ts","sourceRoot":"","sources":["../../../src/connectors/hdfs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvD,QAAA,MAAM,SAAS,EAAE,cAAc,CAAC,SAgC/B,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/src/connectors/hdfs.js

@@ -1,16 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function create(customConfig, logger) {
-    const HdfsClient = require('node-webhdfs').WebHDFSClient;
-    logger.info(`Using hdfs hosts: ${customConfig.host}`);
-    // TODO: there's no error handling here at all???
-    const client = new HdfsClient(customConfig);
-    return {
-        client
-    };
-}
-exports.default = {
-    create,
+// @ts-expect-error
+import { WebHDFSClient } from 'node-webhdfs';
+const connector = {
+    async createClient(customConfig, logger) {
+        logger.info(`Using hdfs hosts: ${customConfig.host}`);
+        // TODO: there's no error handling here at all???
+        const client = new WebHDFSClient(customConfig);
+        return {
+            client,
+            logger
+        };
+    },
     config_schema() {
         return {
             user: {
@@ -32,4 +31,5 @@ exports.default = {
         };
     }
 };
+export default connector;
 //# sourceMappingURL=hdfs.js.map

package/dist/src/connectors/hdfs.js.map

@@ -1 +1 @@
-{"version":3,"file":"hdfs.js","sourceRoot":"","sources":["../../../src/connectors/hdfs.ts"],"names":[],"mappings":";;AAEA,SAAS,MAAM,CAAC,YAAiC,EAAE,MAAc;IAG7D,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC;IACzD,MAAM,CAAC,IAAI,CAAC,qBAAqB,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;IAEtD,iDAAiD;IACjD,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC;IAE5C,OAAO;QACH,MAAM;KACT,CAAC;AACN,CAAC;AAED,kBAAe;IACX,MAAM;IACN,aAAa;QACT,OAAO;YACH,IAAI,EAAE;gBACF,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,SAAS;aACrB;YACD,aAAa,EAAE;gBACX,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,KAAK;aACjB;YACD,aAAa,EAAE;gBACX,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,WAAW;aACvB;YACD,WAAW,EAAE;gBACT,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,aAAa;aACzB;SACJ,CAAC;IACN,CAAC;CACJ,CAAC"}
+{"version":3,"file":"hdfs.js","sourceRoot":"","sources":["../../../src/connectors/hdfs.ts"],"names":[],"mappings":"AAEA,mBAAmB;AACnB,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,SAAS,GAA6B;IACxC,KAAK,CAAC,YAAY,CAAC,YAAiC,EAAE,MAAc;QAChE,MAAM,CAAC,IAAI,CAAC,qBAAqB,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAEtD,iDAAiD;QACjD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,YAAY,CAAC,CAAC;QAE/C,OAAO;YACH,MAAM;YACN,MAAM;SACT,CAAC;IACN,CAAC;IACD,aAAa;QACT,OAAO;YACH,IAAI,EAAE;gBACF,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,SAAS;aACrB;YACD,aAAa,EAAE;gBACX,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,KAAK;aACjB;YACD,aAAa,EAAE;gBACX,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,WAAW;aACvB;YACD,WAAW,EAAE;gBACT,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,aAAa;aACzB;SACJ,CAAC;IACN,CAAC;CACJ,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/src/connectors/hdfs_ha.d.ts

@@ -1,10 +1,4 @@
-import { Logger } from '@terascope/utils';
-declare function create(customConfig: Record<string, any>, logger: Logger): {
-    client: any;
-};
-declare const _default: {
-    create: typeof create;
-    config_schema(): Record<string, any>;
-};
-export default _default;
+import type { Terafoundation } from '@terascope/types';
+declare const connector: Terafoundation.Connector;
+export default connector;
 //# sourceMappingURL=hdfs_ha.d.ts.map

package/dist/src/connectors/hdfs_ha.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hdfs_ha.d.ts","sourceRoot":"","sources":["../../../src/connectors/hdfs_ha.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,iBAAS,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG;IAChE,MAAM,EAAE,GAAG,CAAC;CACf,CAsBA;;;qBAIoB,OAAO,MAAM,EAAE,GAAG,CAAC;;AAFxC,wBAmCE"}
+{"version":3,"file":"hdfs_ha.d.ts","sourceRoot":"","sources":["../../../src/connectors/hdfs_ha.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAOvD,QAAA,MAAM,SAAS,EAAE,cAAc,CAAC,SAwD/B,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/src/connectors/hdfs_ha.js

@@ -1,27 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const bluebird_1 = require("bluebird");
-function create(customConfig, logger) {
-    const HdfsClient = require('node-webhdfs').WebHDFSClient;
-    let highAvailibility = false;
-    let currentNameNode;
-    if (Array.isArray(customConfig.namenode_host)) {
-        ([currentNameNode] = customConfig.namenode_host);
-        customConfig.namenode_list = customConfig.namenode_host;
-        highAvailibility = true;
-    }
-    else {
-        currentNameNode = customConfig.namenode_host;
-    }
-    const config = Object.assign({}, customConfig, { namenode_host: currentNameNode });
-    const client = new HdfsClient(config);
-    logger.info(`Using hdfs hosts: ${currentNameNode}, high-availability: ${highAvailibility}`);
-    return {
-        client: (0, bluebird_1.promisifyAll)(client)
-    };
-}
-exports.default = {
-    create,
+import pkg from 'bluebird';
+// @ts-expect-error
+import { WebHDFSClient } from 'node-webhdfs';
+const { promisifyAll } = pkg;
+const connector = {
+    async createClient(customConfig, logger) {
+        let highAvailibility = false;
+        let currentNameNode;
+        if (Array.isArray(customConfig.namenode_host)) {
+            ([currentNameNode] = customConfig.namenode_host);
+            customConfig.namenode_list = customConfig.namenode_host;
+            highAvailibility = true;
+        }
+        else {
+            currentNameNode = customConfig.namenode_host;
+        }
+        const config = Object.assign({}, customConfig, { namenode_host: currentNameNode });
+        const client = new WebHDFSClient(config);
+        logger.info(`Using hdfs hosts: ${currentNameNode}, high-availability: ${highAvailibility}`);
+        return {
+            client: promisifyAll(client),
+            logger
+        };
+    },
     config_schema() {
         return {
             user: {
@@ -56,4 +56,5 @@ exports.default = {
         };
     }
 };
+export default connector;
 //# sourceMappingURL=hdfs_ha.js.map

package/dist/src/connectors/hdfs_ha.js.map

@@ -1 +1 @@
-{"version":3,"file":"hdfs_ha.js","sourceRoot":"","sources":["../../../src/connectors/hdfs_ha.ts"],"names":[],"mappings":";;AAAA,uCAAwC;AAGxC,SAAS,MAAM,CAAC,YAAiC,EAAE,MAAc;IAG7D,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC;IAEzD,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAC7B,IAAI,eAAe,CAAC;IAEpB,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE;QAC3C,CAAC,CAAC,eAAe,CAAC,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;QACjD,YAAY,CAAC,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC;QACxD,gBAAgB,GAAG,IAAI,CAAC;KAC3B;SAAM;QACH,eAAe,GAAG,YAAY,CAAC,aAAa,CAAC;KAChD;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC,CAAC;IACnF,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;IAEtC,MAAM,CAAC,IAAI,CAAC,qBAAqB,eAAe,wBAAwB,gBAAgB,EAAE,CAAC,CAAC;IAE5F,OAAO;QACH,MAAM,EAAE,IAAA,uBAAY,EAAC,MAAM,CAAC;KAC/B,CAAC;AACN,CAAC;AAED,kBAAe;IACX,MAAM;IACN,aAAa;QACT,OAAO;YACH,IAAI,EAAE;gBACF,GAAG,EAAE,6BAA6B;gBAClC,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;aACjB;YACD,aAAa,EAAE;gBACX,GAAG,EAAE,cAAc;gBACnB,OAAO,EAAE,KAAK;aACjB;YACD,aAAa,EAAE;gBACX,GAAG,EAAE,qDAAqD;gBAC1D,OAAO,EAAE,IAAI;gBACb,MAAM,CAAC,GAAQ;oBACX,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;wBACzB,OAAO;qBACV;oBACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;wBACpB,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;4BAChB,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;yBACzF;wBACD,OAAO;qBACV;oBACD,MAAM,IAAI,KAAK,CAAC,uFAAuF,CAAC,CAAC;gBAC7G,CAAC;aACJ;YACD,WAAW,EAAE;gBACT,GAAG,EAAE,iCAAiC;gBACtC,OAAO,EAAE,aAAa;aACzB;SACJ,CAAC;IACN,CAAC;CACJ,CAAC"}
+{"version":3,"file":"hdfs_ha.js","sourceRoot":"","sources":["../../../src/connectors/hdfs_ha.ts"],"names":[],"mappings":"AAEA,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,mBAAmB;AACnB,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC;AAE7B,MAAM,SAAS,GAA6B;IACxC,KAAK,CAAC,YAAY,CAAC,YAAiC,EAAE,MAAc;QAChE,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IAAI,eAAe,CAAC;QAEpB,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE;YAC3C,CAAC,CAAC,eAAe,CAAC,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;YACjD,YAAY,CAAC,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC;YACxD,gBAAgB,GAAG,IAAI,CAAC;SAC3B;aAAM;YACH,eAAe,GAAG,YAAY,CAAC,aAAa,CAAC;SAChD;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC,CAAC;QACnF,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC;QAEzC,MAAM,CAAC,IAAI,CAAC,qBAAqB,eAAe,wBAAwB,gBAAgB,EAAE,CAAC,CAAC;QAE5F,OAAO;YACH,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC;YAC5B,MAAM;SACT,CAAC;IACN,CAAC;IACD,aAAa;QACT,OAAO;YACH,IAAI,EAAE;gBACF,GAAG,EAAE,6BAA6B;gBAClC,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;aACjB;YACD,aAAa,EAAE;gBACX,GAAG,EAAE,cAAc;gBACnB,OAAO,EAAE,KAAK;aACjB;YACD,aAAa,EAAE;gBACX,GAAG,EAAE,qDAAqD;gBAC1D,OAAO,EAAE,IAAI;gBACb,MAAM,CAAC,GAAQ;oBACX,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;wBACzB,OAAO;qBACV;oBACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;wBACpB,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;4BAChB,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;yBACzF;wBACD,OAAO;qBACV;oBACD,MAAM,IAAI,KAAK,CAAC,uFAAuF,CAAC,CAAC;gBAC7G,CAAC;aACJ;YACD,WAAW,EAAE;gBACT,GAAG,EAAE,iCAAiC;gBACtC,OAAO,EAAE,aAAa;aACzB;SACJ,CAAC;IACN,CAAC;CACJ,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/src/connectors/s3.d.ts

@@ -1,14 +1,4 @@
-import { Logger } from '@terascope/utils';
-import { S3ClientConfig } from '@terascope/file-asset-apis';
-import { Terafoundation } from '@terascope/types';
-declare const _default: {
-    create(): never;
-    createClient(customConfig: S3ClientConfig, logger: Logger): Promise<{
-        client: import("@terascope/file-asset-apis").S3Client;
-        logger: Logger;
-    }>;
-    config_schema(): Record<string, any>;
-    validate_config<S>(subconfig: S3ClientConfig, _sysconfig: Terafoundation.SysConfig<S>): void;
-};
-export default _default;
+import type { Terafoundation } from '@terascope/types';
+declare const connector: Terafoundation.Connector;
+export default connector;
 //# sourceMappingURL=s3.d.ts.map

package/dist/src/connectors/s3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../../../src/connectors/s3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAkB,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;;;+BAMb,cAAc,UAAU,MAAM;;;;qBAI9C,OAAO,MAAM,EAAE,GAAG,CAAC;kCAsDrB,cAAc,4CAE1B,IAAI;;AAhEX,wBA8EE"}
+{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../../../src/connectors/s3.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,QAAA,MAAM,SAAS,EAAE,cAAc,CAAC,SA2E/B,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/src/connectors/s3.js

@@ -1,12 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const file_asset_apis_1 = require("@terascope/file-asset-apis");
-exports.default = {
-    create() {
-        throw new Error('s3 does not support the deprecated "create" method, please use file-assets >= v2.4.0');
-    },
+import { createS3Client } from '@terascope/file-asset-apis';
+const connector = {
     async createClient(customConfig, logger) {
-        const client = await (0, file_asset_apis_1.createS3Client)(customConfig, logger);
+        const client = await createS3Client(customConfig, logger);
         return { client, logger };
     },
     config_schema() {
@@ -62,19 +57,19 @@ exports.default = {
             }
         };
     },
-    validate_config(subconfig, _sysconfig) {
-        var _a, _b;
-        const caCertExists = (((_a = subconfig.caCertificate) === null || _a === void 0 ? void 0 : _a.length) !== 0);
-        const certLocationExists = (((_b = subconfig.certLocation) === null || _b === void 0 ? void 0 : _b.length) !== 0);
+    validate_config(config, _sysconfig) {
+        const caCertExists = (config.caCertificate?.length !== 0);
+        const certLocationExists = (config.certLocation?.length !== 0);
         if (caCertExists && certLocationExists) {
             throw new Error('"caCertificate" and "certLocation" contradict.\n'
                 + '  Use only one or the other.');
         }
-        else if ((caCertExists && !subconfig.sslEnabled)
-            || (certLocationExists && !subconfig.sslEnabled)) {
+        else if ((caCertExists && !config.sslEnabled)
+            || (certLocationExists && !config.sslEnabled)) {
             throw new Error('A certificate is provided but sslEnabled is set to "false".\n'
                 + '  Set sslEnabled to "true" or don\'t provide a certificate.');
         }
     }
 };
+export default connector;
 //# sourceMappingURL=s3.js.map

package/dist/src/connectors/s3.js.map

@@ -1 +1 @@
-{"version":3,"file":"s3.js","sourceRoot":"","sources":["../../../src/connectors/s3.ts"],"names":[],"mappings":";;AACA,gEAA4E;AAG5E,kBAAe;IACX,MAAM;QACF,MAAM,IAAI,KAAK,CAAC,sFAAsF,CAAC,CAAC;IAC5G,CAAC;IACD,KAAK,CAAC,YAAY,CAAC,YAA4B,EAAE,MAAc;QAC3D,MAAM,MAAM,GAAG,MAAM,IAAA,gCAAc,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC9B,CAAC;IACD,aAAa;QACT,OAAO;YACH,QAAQ,EAAE;gBACN,GAAG,EAAE,oBAAoB;gBACzB,OAAO,EAAE,cAAc;aAC1B;YACD,WAAW,EAAE;gBACT,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,MAAM;aACjB;YACD,eAAe,EAAE;gBACb,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,MAAM;aACjB;YACD,MAAM,EAAE;gBACJ,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,WAAW;gBACpB,MAAM,EAAE,MAAM;aACjB;YACD,UAAU,EAAE;gBACR,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,MAAM;aACjB;YACD,UAAU,EAAE;gBACR,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,OAAO;aAClB;YACD,YAAY,EAAE;gBACV,GAAG,EAAE,uDAAuD;gBAC5D,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,MAAM;aACjB;YACD,aAAa,EAAE;gBACX,GAAG,EAAE,0DAA0D;gBAC/D,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,MAAM;aACjB;YACD,cAAc,EAAE;gBACZ,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,OAAO;aAClB;YACD,cAAc,EAAE;gBACZ,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,OAAO;aAClB;SACJ,CAAC;IACN,CAAC;IACD,eAAe,CACX,SAAyB,EACzB,UAAuC;;QAEvC,MAAM,YAAY,GAAY,CAAC,CAAA,MAAA,SAAS,CAAC,aAAa,0CAAE,MAAM,MAAK,CAAC,CAAC,CAAC;QACtE,MAAM,kBAAkB,GAAY,CAAC,CAAA,MAAA,SAAS,CAAC,YAAY,0CAAE,MAAM,MAAK,CAAC,CAAC,CAAC;QAC3E,IAAI,YAAY,IAAI,kBAAkB,EAAE;YACpC,MAAM,IAAI,KAAK,CAAC,kDAAkD;kBAChE,8BAA8B,CAAC,CAAC;SACrC;aAAM,IACH,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;eACpC,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAClD;YACE,MAAM,IAAI,KAAK,CAAC,+DAA+D;kBACzE,6DAA6D,CAAC,CAAC;SACxE;IACL,CAAC;CACJ,CAAC"}
+{"version":3,"file":"s3.js","sourceRoot":"","sources":["../../../src/connectors/s3.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAkB,MAAM,4BAA4B,CAAC;AAG5E,MAAM,SAAS,GAA6B;IACxC,KAAK,CAAC,YAAY,CAAC,YAA4B,EAAE,MAAc;QAC3D,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC9B,CAAC;IACD,aAAa;QACT,OAAO;YACH,QAAQ,EAAE;gBACN,GAAG,EAAE,oBAAoB;gBACzB,OAAO,EAAE,cAAc;aAC1B;YACD,WAAW,EAAE;gBACT,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,MAAM;aACjB;YACD,eAAe,EAAE;gBACb,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,MAAM;aACjB;YACD,MAAM,EAAE;gBACJ,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,WAAW;gBACpB,MAAM,EAAE,MAAM;aACjB;YACD,UAAU,EAAE;gBACR,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,MAAM;aACjB;YACD,UAAU,EAAE;gBACR,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,OAAO;aAClB;YACD,YAAY,EAAE;gBACV,GAAG,EAAE,uDAAuD;gBAC5D,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,MAAM;aACjB;YACD,aAAa,EAAE;gBACX,GAAG,EAAE,0DAA0D;gBAC/D,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,MAAM;aACjB;YACD,cAAc,EAAE;gBACZ,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,OAAO;aAClB;YACD,cAAc,EAAE;gBACZ,GAAG,EAAE,EAAE;gBACP,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,OAAO;aAClB;SACJ,CAAC;IACN,CAAC;IACD,eAAe,CACX,MAAsB,EACtB,UAAuC;QAEvC,MAAM,YAAY,GAAY,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC;QACnE,MAAM,kBAAkB,GAAY,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC;QACxE,IAAI,YAAY,IAAI,kBAAkB,EAAE;YACpC,MAAM,IAAI,KAAK,CAAC,kDAAkD;kBAChE,8BAA8B,CAAC,CAAC;SACrC;aAAM,IACH,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;eACjC,CAAC,kBAAkB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAC/C;YACE,MAAM,IAAI,KAAK,CAAC,+DAA+D;kBACzE,6DAA6D,CAAC,CAAC;SACxE;IACL,CAAC;CACJ,CAAC;AAEF,eAAe,SAAS,CAAC"}