@hatchet-dev/typescript-sdk 0.1.27 → 0.1.29

package/clients/event/event-client.js

@@ -32,14 +32,16 @@ class EventClient {
         this.logger = new logger_1.Logger(`Dispatcher`, config.log_level);
     }
     push(type, input) {
+        var _a;
+        const namespacedType = `${(_a = this.config.namespace) !== null && _a !== void 0 ? _a : ''}${type}`;
         const req = {
-            key: type,
+            key: namespacedType,
             payload: JSON.stringify(input),
             eventTimestamp: new Date(),
         };
         try {
             const e = this.client.push(req);
-            this.logger.info(`Event pushed: ${type}`);
+            this.logger.info(`Event pushed: ${namespacedType}`);
             return e;
         }
         catch (e) {

package/clients/hatchet-client/client-config.d.ts

@@ -1,19 +1,19 @@
 import { ChannelCredentials } from 'nice-grpc';
 import { z } from 'zod';
 declare const ClientTLSConfigSchema: z.ZodObject<{
-    tls_strategy: z.ZodOptional<z.ZodEnum<["tls", "mtls"]>>;
+    tls_strategy: z.ZodOptional<z.ZodEnum<["tls", "mtls", "none"]>>;
     cert_file: z.ZodOptional<z.ZodString>;
     ca_file: z.ZodOptional<z.ZodString>;
     key_file: z.ZodOptional<z.ZodString>;
     server_name: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    tls_strategy?: "tls" | "mtls" | undefined;
+    tls_strategy?: "tls" | "mtls" | "none" | undefined;
     cert_file?: string | undefined;
     ca_file?: string | undefined;
     key_file?: string | undefined;
     server_name?: string | undefined;
 }, {
-    tls_strategy?: "tls" | "mtls" | undefined;
+    tls_strategy?: "tls" | "mtls" | "none" | undefined;
     cert_file?: string | undefined;
     ca_file?: string | undefined;
     key_file?: string | undefined;
@@ -22,19 +22,19 @@ declare const ClientTLSConfigSchema: z.ZodObject<{
 export declare const ClientConfigSchema: z.ZodObject<{
     token: z.ZodString;
     tls_config: z.ZodObject<{
-        tls_strategy: z.ZodOptional<z.ZodEnum<["tls", "mtls"]>>;
+        tls_strategy: z.ZodOptional<z.ZodEnum<["tls", "mtls", "none"]>>;
         cert_file: z.ZodOptional<z.ZodString>;
         ca_file: z.ZodOptional<z.ZodString>;
         key_file: z.ZodOptional<z.ZodString>;
         server_name: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
-        tls_strategy?: "tls" | "mtls" | undefined;
+        tls_strategy?: "tls" | "mtls" | "none" | undefined;
         cert_file?: string | undefined;
         ca_file?: string | undefined;
         key_file?: string | undefined;
         server_name?: string | undefined;
     }, {
-        tls_strategy?: "tls" | "mtls" | undefined;
+        tls_strategy?: "tls" | "mtls" | "none" | undefined;
         cert_file?: string | undefined;
         ca_file?: string | undefined;
         key_file?: string | undefined;
@@ -44,10 +44,11 @@ export declare const ClientConfigSchema: z.ZodObject<{
     api_url: z.ZodString;
     log_level: z.ZodOptional<z.ZodEnum<["OFF", "DEBUG", "INFO", "WARN", "ERROR"]>>;
     tenant_id: z.ZodString;
+    namespace: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     token: string;
     tls_config: {
-        tls_strategy?: "tls" | "mtls" | undefined;
+        tls_strategy?: "tls" | "mtls" | "none" | undefined;
         cert_file?: string | undefined;
         ca_file?: string | undefined;
         key_file?: string | undefined;
@@ -57,10 +58,11 @@ export declare const ClientConfigSchema: z.ZodObject<{
     api_url: string;
     tenant_id: string;
     log_level?: "OFF" | "DEBUG" | "INFO" | "WARN" | "ERROR" | undefined;
+    namespace?: string | undefined;
 }, {
     token: string;
     tls_config: {
-        tls_strategy?: "tls" | "mtls" | undefined;
+        tls_strategy?: "tls" | "mtls" | "none" | undefined;
         cert_file?: string | undefined;
         ca_file?: string | undefined;
         key_file?: string | undefined;
@@ -70,6 +72,7 @@ export declare const ClientConfigSchema: z.ZodObject<{
     api_url: string;
     tenant_id: string;
     log_level?: "OFF" | "DEBUG" | "INFO" | "WARN" | "ERROR" | undefined;
+    namespace?: string | undefined;
 }>;
 export type ClientConfig = z.infer<typeof ClientConfigSchema> & {
     credentials?: ChannelCredentials;

package/clients/hatchet-client/client-config.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientConfigSchema = void 0;
 const zod_1 = require("zod");
 const ClientTLSConfigSchema = zod_1.z.object({
-    tls_strategy: zod_1.z.enum(['tls', 'mtls']).optional(),
+    tls_strategy: zod_1.z.enum(['tls', 'mtls', 'none']).optional(),
     cert_file: zod_1.z.string().optional(),
     ca_file: zod_1.z.string().optional(),
     key_file: zod_1.z.string().optional(),
@@ -16,4 +16,5 @@ exports.ClientConfigSchema = zod_1.z.object({
     api_url: zod_1.z.string(),
     log_level: zod_1.z.enum(['OFF', 'DEBUG', 'INFO', 'WARN', 'ERROR']).optional(),
     tenant_id: zod_1.z.string(),
+    namespace: zod_1.z.string().optional(),
 });

package/clients/worker/worker.d.ts

@@ -22,7 +22,7 @@ export declare class Worker {
         handleKill?: boolean;
         maxRuns?: number;
     });
-    registerWorkflow(workflow: Workflow): Promise<void>;
+    registerWorkflow(initWorkflow: Workflow): Promise<void>;
     registerAction<T, K>(actionId: string, action: StepRunFunction<T, K>): void;
     handleStartStepRun(action: Action): void;
     handleStartGroupKeyRun(action: Action): void;

package/clients/worker/worker.js

@@ -32,7 +32,7 @@ class Worker {
         this.futures = {};
         this.contexts = {};
         this.client = client;
-        this.name = options.name;
+        this.name = this.client.config.namespace + options.name;
         this.action_registry = {};
         this.maxRuns = options.maxRuns;
         process.on('SIGTERM', () => this.exitGracefully(true));
@@ -41,9 +41,10 @@ class Worker {
         this.handle_kill = options.handleKill === undefined ? true : options.handleKill;
         this.logger = new logger_1.Logger(`Worker/${this.name}`, this.client.config.log_level);
     }
-    registerWorkflow(workflow) {
+    registerWorkflow(initWorkflow) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            const workflow = Object.assign(Object.assign({}, initWorkflow), { id: this.client.config.namespace + initWorkflow.id });
             try {
                 const concurrency = ((_a = workflow.concurrency) === null || _a === void 0 ? void 0 : _a.name)
                     ? {
@@ -56,7 +57,7 @@ class Worker {
                     name: workflow.id,
                     description: workflow.description,
                     version: workflow.version || '',
-                    eventTriggers: workflow.on.event ? [workflow.on.event] : [],
+                    eventTriggers: workflow.on.event ? [this.client.config.namespace + workflow.on.event] : [],
                     cronTriggers: workflow.on.cron ? [workflow.on.cron] : [],
                     scheduledTriggers: [],
                     concurrency,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hatchet-dev/typescript-sdk",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "Background task orchestration & visibility for developers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,6 +34,7 @@
     "exec": "npx dotenv -- ts-node -r tsconfig-paths/register --project tsconfig.json",
     "example:event": "npm run exec -- ./examples/example-event.ts",
     "example:event-listen": "npm run exec -- ./examples/example-event-with-results.ts",
+    "worker:namespaced": "npm run exec -- ./examples/namespaced-worker.ts",
     "worker:simple": "npm run exec -- ./examples/simple-worker.ts",
     "manual:trigger": "npm run exec -- ./examples/manual-trigger.ts",
     "worker:dag": "npm run exec -- ./examples/dag-worker.ts",

package/util/config-loader/config-loader.js

@@ -34,7 +34,7 @@ const token_1 = require("./token");
 const DEFAULT_CONFIG_FILE = '.hatchet.yaml';
 class ConfigLoader {
     static loadClientConfig(override, config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
         const yaml = this.loadYamlConfig(config === null || config === void 0 ? void 0 : config.path);
         const tlsConfig = (_a = override === null || override === void 0 ? void 0 : override.tls_config) !== null && _a !== void 0 ? _a : {
             tls_strategy: (_d = (_c = (_b = yaml === null || yaml === void 0 ? void 0 : yaml.tls_config) === null || _b === void 0 ? void 0 : _b.tls_strategy) !== null && _c !== void 0 ? _c : this.env('HATCHET_CLIENT_TLS_STRATEGY')) !== null && _d !== void 0 ? _d : 'tls',
@@ -44,6 +44,9 @@ class ConfigLoader {
             server_name: (_m = (_l = yaml === null || yaml === void 0 ? void 0 : yaml.tls_config) === null || _l === void 0 ? void 0 : _l.server_name) !== null && _m !== void 0 ? _m : this.env('HATCHET_CLIENT_TLS_SERVER_NAME'),
         };
         const token = (_p = (_o = override === null || override === void 0 ? void 0 : override.token) !== null && _o !== void 0 ? _o : yaml === null || yaml === void 0 ? void 0 : yaml.token) !== null && _p !== void 0 ? _p : this.env('HATCHET_CLIENT_TOKEN');
+        if (!token) {
+            throw new Error('No token provided. Provide it by setting the HATCHET_CLIENT_TOKEN environment variable.');
+        }
         let grpcBroadcastAddress;
         let apiUrl;
         const tenantId = (0, token_1.getTenantIdFromJWT)(token);
@@ -61,19 +64,25 @@ class ConfigLoader {
             grpcBroadcastAddress = (_v = yaml === null || yaml === void 0 ? void 0 : yaml.host_port) !== null && _v !== void 0 ? _v : this.env('HATCHET_CLIENT_HOST_PORT');
             apiUrl = (_x = (_w = override === null || override === void 0 ? void 0 : override.api_url) !== null && _w !== void 0 ? _w : yaml === null || yaml === void 0 ? void 0 : yaml.api_url) !== null && _x !== void 0 ? _x : this.env('HATCHET_CLIENT_API_URL');
         }
+        const namespace = (_z = (_y = override === null || override === void 0 ? void 0 : override.namespace) !== null && _y !== void 0 ? _y : yaml === null || yaml === void 0 ? void 0 : yaml.namespace) !== null && _z !== void 0 ? _z : this.env('HATCHET_CLIENT_NAMESPACE');
         return {
-            token: (_z = (_y = override === null || override === void 0 ? void 0 : override.token) !== null && _y !== void 0 ? _y : yaml === null || yaml === void 0 ? void 0 : yaml.token) !== null && _z !== void 0 ? _z : this.env('HATCHET_CLIENT_TOKEN'),
+            token: (_1 = (_0 = override === null || override === void 0 ? void 0 : override.token) !== null && _0 !== void 0 ? _0 : yaml === null || yaml === void 0 ? void 0 : yaml.token) !== null && _1 !== void 0 ? _1 : this.env('HATCHET_CLIENT_TOKEN'),
             host_port: grpcBroadcastAddress,
             api_url: apiUrl,
             tls_config: tlsConfig,
-            log_level: (_2 = (_1 = (_0 = override === null || override === void 0 ? void 0 : override.log_level) !== null && _0 !== void 0 ? _0 : yaml === null || yaml === void 0 ? void 0 : yaml.log_level) !== null && _1 !== void 0 ? _1 : this.env('HATCHET_CLIENT_LOG_LEVEL')) !== null && _2 !== void 0 ? _2 : 'INFO',
+            log_level: (_4 = (_3 = (_2 = override === null || override === void 0 ? void 0 : override.log_level) !== null && _2 !== void 0 ? _2 : yaml === null || yaml === void 0 ? void 0 : yaml.log_level) !== null && _3 !== void 0 ? _3 : this.env('HATCHET_CLIENT_LOG_LEVEL')) !== null && _4 !== void 0 ? _4 : 'INFO',
             tenant_id: tenantId,
+            namespace: namespace ? `${namespace}_` : '',
         };
     }
     static get default_yaml_config_path() {
         return p.join(process.cwd(), DEFAULT_CONFIG_FILE);
     }
     static createCredentials(config) {
+        // if none, create insecure credentials
+        if (config.tls_strategy === 'none') {
+            return nice_grpc_1.ChannelCredentials.createInsecure();
+        }
         if (config.tls_strategy === 'tls') {
             const rootCerts = config.ca_file ? (0, fs_1.readFileSync)(config.ca_file) : undefined;
             return nice_grpc_1.ChannelCredentials.createSsl(rootCerts);