@onlineapps/cookbook-template-helpers 1.0.1 → 1.0.2

package/README.md

@@ -153,17 +153,16 @@ const executor = new CookbookExecutor(cookbook, {
 
 ## Dependencies
 
-- `@onlineapps/conn-base-storage` - For MinIO storage operations
+- `@onlineapps/content-resolver` - Unified access to Content Descriptors (MinIO download/upload)
 
 ## Environment Variables
 
 Helper functions use the following environment variables for storage access:
 
-- `MINIO_HOST` - MinIO endpoint (default: `api_shared_storage`)
-- `MINIO_PORT` - MinIO port (default: `9000`)
-- `MINIO_ACCESS_KEY` - MinIO access key (default: `minioadmin`)
-- `MINIO_SECRET_KEY` - MinIO secret key (default: `minioadmin`)
-- `MINIO_USE_SSL` - Use SSL (default: `false`)
+- `MINIO_HOST` - MinIO endpoint (required unless you inject `contentResolver`)
+- `MINIO_PORT` - MinIO port (required unless you inject `contentResolver`)
+- `MINIO_ACCESS_KEY` - MinIO access key (required unless you inject `contentResolver`)
+- `MINIO_SECRET_KEY` - MinIO secret key (required unless you inject `contentResolver`)
 
 ## File Descriptor Format
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/cookbook-template-helpers",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Template helper functions for cookbook variable resolution - string2file, file2string, and more",
   "main": "src/index.js",
   "scripts": {
@@ -19,10 +19,10 @@
   "author": "OnlineApps",
   "license": "PROPRIETARY",
   "dependencies": {
-    "@onlineapps/conn-base-storage": "^1.0.0"
+    "@onlineapps/content-resolver": "1.1.6"
   },
   "devDependencies": {
-    "jest": "^29.7.0"
+    "jest": "29.7.0"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/helpers/fileHelpers.js

@@ -5,32 +5,43 @@
  * Converts between string content and file descriptors
  */
 
-const StorageConnector = require('@onlineapps/conn-base-storage');
+const ContentResolver = require('@onlineapps/content-resolver');
 
 /**
- * Get storage instance from context or create new one
+ * Get ContentResolver instance from helper context.
+ * Uses DI if provided; otherwise relies on required MINIO_* env vars enforced by ContentResolver.
  * @private
- * @param {Object} context - Workflow context
- * @returns {Promise<Object>} Storage connector instance
+ * @param {Object} helperContext - Helper context
+ * @returns {ContentResolver}
  */
-async function getStorageFromContext(context) {
-  // If storage is already in context, use it
-  if (context._storage) {
-    return context._storage;
+function getContentResolverFromContext(helperContext) {
+  if (!helperContext || typeof helperContext !== 'object') {
+    throw new Error('[cookbook-template-helpers] Helper context is required - Expected { data, workflow_id, step_id, contentResolver? }');
   }
 
-  // Otherwise create new storage instance
-  const storage = new StorageConnector({
-    endpoint: process.env.MINIO_HOST || 'api_shared_storage',
-    port: parseInt(process.env.MINIO_PORT || '9000', 10),
-    accessKey: process.env.MINIO_ACCESS_KEY || 'minioadmin',
-    secretKey: process.env.MINIO_SECRET_KEY || 'minioadmin',
-    useSSL: process.env.MINIO_USE_SSL === 'true'
-  });
+  if (
+    helperContext.contentResolver &&
+    typeof helperContext.contentResolver.getAsString === 'function' &&
+    typeof helperContext.contentResolver.createDescriptor === 'function'
+  ) {
+    return helperContext.contentResolver;
+  }
+
+  const workflow_id =
+    helperContext.workflow_id ||
+    helperContext.data?.variables?.workflow_id ||
+    helperContext.data?.workflow_id ||
+    null;
 
-  // Cache in context for reuse
-  context._storage = storage;
-  return storage;
+  const step_id =
+    helperContext.step_id ||
+    helperContext.data?.variables?.step_id ||
+    helperContext.data?.step_id ||
+    null;
+
+  return new ContentResolver({
+    context: { workflow_id, step_id }
+  });
 }
 
 /**
@@ -55,72 +66,40 @@ async function getStorageFromContext(context) {
  * }, context);
  */
 async function string2file(input, context) {
-  if (!input) {
-    throw new Error('[string2file] Input is required');
-  }
+  const resolver = getContentResolverFromContext(context);
 
   // Pokud už je file descriptor, vrať ho
-  if (input._descriptor && input.type === 'file') {
+  if (input && input._descriptor === true && input.type === 'file') {
     return input;
   }
 
   // Pokud je inline descriptor, převeď na file
-  if (input._descriptor && input.type === 'inline') {
+  if (input && input._descriptor === true && input.type === 'inline') {
     const content = input.content;
     if (typeof content !== 'string') {
       throw new Error('[string2file] Inline descriptor content must be a string');
     }
 
-    const storage = await getStorageFromContext(context);
-    const encoding = input.encoding || 'utf-8';
-    const buffer = Buffer.from(content, encoding);
-
-    // Upload do MinIO
-    const workflowId = context.workflow_id || context.workflowId || 'temp';
-    const stepId = context.step_id || context.stepId || 'helpers';
-    const pathPrefix = `helpers/${workflowId}/${stepId}`;
-
-    const result = await storage.uploadWithFingerprint(
-      'workflow',
-      buffer,
-      pathPrefix
-    );
-
-    return {
-      _descriptor: true,
-      type: 'file',
-      storage_ref: `minio://workflow/${result.path}`,
-      filename: input.filename || 'content.txt',
-      content_type: input.content_type || 'text/plain',
-      size: buffer.length,
-      fingerprint: result.fingerprint
-    };
+    return await resolver.createDescriptor(content, {
+      filename: input.filename,
+      content_type: input.content_type,
+      context: { workflow_id: context.workflow_id, step_id: context.step_id },
+      forceFile: true
+    });
   }
 
   // Pokud je string, vytvoř file descriptor
   if (typeof input === 'string') {
-    const storage = await getStorageFromContext(context);
-    const buffer = Buffer.from(input, 'utf-8');
-
-    const workflowId = context.workflow_id || context.workflowId || 'temp';
-    const stepId = context.step_id || context.stepId || 'helpers';
-    const pathPrefix = `helpers/${workflowId}/${stepId}`;
-
-    const result = await storage.uploadWithFingerprint(
-      'workflow',
-      buffer,
-      pathPrefix
-    );
-
-    return {
-      _descriptor: true,
-      type: 'file',
-      storage_ref: `minio://workflow/${result.path}`,
+    return await resolver.createDescriptor(input, {
       filename: 'content.txt',
       content_type: 'text/plain',
-      size: buffer.length,
-      fingerprint: result.fingerprint
-    };
+      context: { workflow_id: context.workflow_id, step_id: context.step_id },
+      forceFile: true
+    });
+  }
+
+  if (input === null || input === undefined) {
+    throw new Error('[string2file] Input is required');
   }
 
   throw new Error('[string2file] Invalid input - expected string or descriptor');
@@ -152,46 +131,8 @@ async function string2file(input, context) {
  * }, context);
  */
 async function file2string(descriptor, context) {
-  // Pokud není descriptor, vrať jak je (pokud je string)
-  if (!descriptor || !descriptor._descriptor) {
-    if (typeof descriptor === 'string') {
-      return descriptor;
-    }
-    return String(descriptor || '');
-  }
-
-  // Pokud je inline, vrať content
-  if (descriptor.type === 'inline') {
-    return descriptor.content || '';
-  }
-
-  // Pokud je file, stáhni z MinIO
-  if (descriptor.type === 'file') {
-    if (!descriptor.storage_ref) {
-      throw new Error('[file2string] File descriptor missing storage_ref');
-    }
-
-    const storage = await getStorageFromContext(context);
-    
-    // Parse storage_ref: minio://workflow/path/to/file
-    const match = descriptor.storage_ref.match(/^minio:\/\/([^\/]+)\/(.+)$/);
-    if (!match) {
-      throw new Error(`[file2string] Invalid storage_ref format: ${descriptor.storage_ref}`);
-    }
-
-    const [, bucket, path] = match;
-    
-    // Download with fingerprint verification
-    const content = await storage.downloadWithVerification(
-      bucket,
-      path,
-      descriptor.fingerprint
-    );
-
-    return content.toString('utf-8');
-  }
-
-  throw new Error(`[file2string] Invalid descriptor type: ${descriptor.type}`);
+  const resolver = getContentResolverFromContext(context);
+  return await resolver.getAsString(descriptor);
 }
 
 module.exports = {