streamby-core 0.24.14 → 0.24.16

package/dist/middleware/routes/export.js

@@ -1,37 +1,4 @@
 "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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportRouter = exportRouter;
 const express_1 = require("express");
@@ -73,9 +40,18 @@ function exportRouter(config) {
             let data;
             if (project.dbType === 'nosql') {
                 const db = connection.client.db();
-                if (exportMetadata.type === 'raw' || exportMetadata.type === 'json') {
+                if (exportMetadata.type === 'json') {
                     const rawData = await db.collection(exportMetadata.collectionName).findOne({ _id: new mongodb_1.ObjectId(exportId) });
-                    data = rawData ? { json: rawData.json, name: rawData.name, method: rawData.method, collectionName: rawData.collectionName, createdAt: rawData.createdAt, updatedAt: rawData.updatedAt, type: exportMetadata.type } : null;
+                    data = {
+                        json: rawData?.json,
+                        name: rawData?.name,
+                        method: rawData?.method,
+                        collectionName: rawData?.collectionName,
+                        createdAt: rawData?.createdAt,
+                        updatedAt: rawData?.updatedAt,
+                        type: exportMetadata.type,
+                        description: rawData?.description,
+                    };
                 }
                 else if (exportMetadata.type === 'externalApi') {
                     const ProjectModel = (0, manager_1.getModel)('projects', 'nosql');
@@ -83,11 +59,48 @@ function exportRouter(config) {
                     if (!currentProject) {
                         return res.status(404).json({ message: 'Project not found.' });
                     }
-                    data = { name: exportMetadata.name, createdAt: exportMetadata.createdAt, updatedAt: exportMetadata.updatedAt, type: exportMetadata.type, collectionName: exportMetadata.collectionName };
+                    let headers = {};
+                    if (exportMetadata.credentialId) {
+                        if (!(0, encryption_1.isEncryptionKeySet)()) {
+                            throw new Error('Encryption key is not set. Cannot use encrypted credentials.');
+                        }
+                        const credential = project.credentials?.find((cred) => cred.id === exportMetadata.credentialId);
+                        if (credential) {
+                            const decryptedValue = (0, encryption_1.decrypt)(credential.encryptedValue);
+                            const authPrefix = exportMetadata.prefix ? `${exportMetadata.prefix} ` : '';
+                            headers = {
+                                'Authorization': `${authPrefix}${decryptedValue}`,
+                                'Content-Type': 'application/json',
+                            };
+                        }
+                    }
+                    const externalApiData = await fetch(exportMetadata.apiUrl, { headers });
+                    const rawData = await externalApiData.json();
+                    data = {
+                        json: rawData || {},
+                        name: exportMetadata.name,
+                        createdAt: exportMetadata.createdAt,
+                        updatedAt: exportMetadata.updatedAt,
+                        type: exportMetadata.type,
+                        apiUrl: exportMetadata.apiUrl,
+                        prefix: exportMetadata.prefix,
+                        collectionName: exportMetadata.collectionName,
+                        description: exportMetadata?.description,
+                    };
                 }
                 else {
                     const rawData = await db.collection(exportMetadata.collectionName).findOne({ _id: new mongodb_1.ObjectId(exportId) });
-                    data = rawData ? { json: rawData.json, name: rawData.name, method: rawData.method, collectionName: rawData.collectionName, createdAt: rawData.createdAt, updatedAt: rawData.updatedAt, type: exportMetadata.type } : null;
+                    data = {
+                        json: rawData?.json,
+                        name: rawData?.name,
+                        method: rawData?.method,
+                        createdAt: rawData?.createdAt,
+                        updatedAt: rawData?.updatedAt,
+                        collectionName: rawData?.collectionName,
+                        type: exportMetadata.type,
+                        credentialId: exportMetadata.credentialId,
+                        description: rawData?.description,
+                    };
                 }
             }
             else if (project.dbType === 'sql') {
@@ -120,7 +133,7 @@ function exportRouter(config) {
                 return res.status(401).json({ message: 'Unauthorized' });
             }
             const projectId = req.params.id;
-            const { name, description, collectionName, jsonData, isPrivate, allowedOrigin, exportType, apiUrl, credentialId, prefix } = req.body;
+            const { name, description, fields, collectionName, jsonData, isPrivate, allowedOrigin, exportType, apiUrl, credentialId, prefix } = req.body;
             if (!name || !collectionName) {
                 return res.status(400).json({ message: 'Missing export name or collectionName' });
             }
@@ -136,7 +149,7 @@ function exportRouter(config) {
             if (!project || !(0, auth_1.isProjectMember)(project, auth.userId)) {
                 return res.status(403).json({ message: 'Unauthorized project access' });
             }
-            const result = await (0, export_1.createExport)(config, projectId, name, collectionName, jsonData, project.dbType, exportType || 'raw', isPrivate, allowedOrigin, apiUrl, credentialId, prefix);
+            const result = await (0, export_1.createExport)(config, projectId, description, fields, name, jsonData, project.dbType, exportType, isPrivate, allowedOrigin, apiUrl, credentialId, prefix);
             res.status(201).json({ data: result, message: result.message });
         }
         catch (err) {
@@ -150,7 +163,7 @@ function exportRouter(config) {
                 return res.status(401).json({ message: 'Unauthorized' });
             }
             const { id: projectId, export_id: exportId } = req.params;
-            const { name, collectionName, description, jsonData, isPrivate, allowedOrigin, exportType, apiUrl, credentialId, prefix } = req.body;
+            const { name, collectionName, description, fields, jsonData, isPrivate, allowedOrigin, exportType, apiUrl, credentialId, prefix } = req.body;
             if (!name || !collectionName) {
                 return res.status(400).json({ message: 'Missing name or collectionName' });
             }
@@ -166,7 +179,7 @@ function exportRouter(config) {
             if (!project || !(0, auth_1.isProjectMember)(project, auth.userId)) {
                 return res.status(403).json({ message: 'Unauthorized project access' });
             }
-            const result = await (0, export_1.updateExport)(config, projectId, exportId, name, collectionName, jsonData, project.dbType, exportType || 'raw', isPrivate, allowedOrigin, apiUrl, credentialId, prefix);
+            const result = await (0, export_1.updateExport)(config, projectId, exportId, description, fields, name, collectionName, jsonData, project.dbType, exportType, isPrivate, allowedOrigin, apiUrl, credentialId, prefix);
             res.status(200).json({ data: result, message: result.message });
         }
         catch (err) {
@@ -239,7 +252,7 @@ function exportRouter(config) {
             let data;
             if (project.dbType === 'nosql') {
                 const db = connection.client.db();
-                if (exportMetadata.type === 'raw' || exportMetadata.type === 'json') {
+                if (exportMetadata.type === 'json') {
                     const rawData = await db.collection(exportMetadata.collectionName).findOne({ _id: new mongodb_1.ObjectId(exportMetadata.id) });
                     data = rawData ? rawData.json : null;
                 }
@@ -261,7 +274,6 @@ function exportRouter(config) {
                         };
                     }
                     try {
-                        const fetch = (await Promise.resolve().then(() => __importStar(require('node-fetch')))).default;
                         const response = await fetch(exportMetadata.apiUrl, { headers });
                         if (!response.ok) {
                             throw new Error(`Failed to fetch from external API: ${response.statusText}`);
@@ -271,6 +283,14 @@ function exportRouter(config) {
                     catch (error) {
                         throw new Error(`Error fetching from external API: ${error.message}`);
                     }
+                    if (exportMetadata.fields && exportMetadata.fields.length > 0) {
+                        data = data.map((item) => {
+                            return exportMetadata.fields.reduce((filtered, field) => {
+                                filtered[field.name] = item[field.name];
+                                return filtered;
+                            }, {});
+                        });
+                    }
                 }
             }
             else if (project.dbType === 'sql') {
@@ -280,7 +300,7 @@ function exportRouter(config) {
             if (!data) {
                 return res.status(404).json({ message: 'Export data not found' });
             }
-            res.json(data); // Return the raw data directly
+            res.json(data);
         }
         catch (err) {
             res.status(500).json({ message: 'Failed to fetch public export data', details: err.message });

package/dist/services/export.d.ts

@@ -1,11 +1,11 @@
-import { DatabaseType, StreamByConfig } from '../types';
+import { FieldDefinition, DatabaseType, StreamByConfig } from '../types';
 interface CreateExportResult {
     exportId: string;
     collectionName: string;
     message: string;
 }
-export declare function createExport(config: StreamByConfig, projectId: string, exportName: string, collectionName: string, jsonData: any, dbType: DatabaseType, exportType: 'structured' | 'raw' | 'json' | 'externalApi', isPrivate?: boolean, allowedOrigin?: string[], apiUrl?: string, credentialId?: string, prefix?: string): Promise<CreateExportResult>;
-export declare function updateExport(config: StreamByConfig, projectId: string, exportId: string, exportName: string, collectionName: string, jsonData: any, dbType: DatabaseType, exportType: 'structured' | 'raw' | 'json' | 'externalApi', isPrivate?: boolean, allowedOrigin?: string[], apiUrl?: string, credentialId?: string, prefix?: string): Promise<CreateExportResult>;
+export declare function createExport(config: StreamByConfig, projectId: string, description: string, fields: FieldDefinition[], exportName: string, jsonData: any, dbType: DatabaseType, exportType: 'json' | 'externalApi', isPrivate?: boolean, allowedOrigin?: string[], apiUrl?: string, credentialId?: string, prefix?: string): Promise<CreateExportResult>;
+export declare function updateExport(config: StreamByConfig, projectId: string, exportId: string, description: string, fields: FieldDefinition[], exportName: string, collectionName: string, jsonData: any, dbType: DatabaseType, exportType: 'json' | 'externalApi', isPrivate?: boolean, allowedOrigin?: string[], apiUrl?: string, credentialId?: string, prefix?: string): Promise<CreateExportResult>;
 export declare function deleteExport(config: StreamByConfig, projectId: string, exportId: string, dbType: DatabaseType, collectionName: string): Promise<{
     message: string;
 }>;

package/dist/services/export.js

@@ -9,7 +9,7 @@ const connectionManager_1 = require("../adapters/database/connectionManager");
 const nosql_1 = require("../adapters/database/nosql");
 const sql_1 = require("../adapters/database/sql");
 const encryption_1 = require("../utils/encryption");
-async function createExport(config, projectId, exportName, collectionName, jsonData, dbType, exportType, isPrivate, allowedOrigin, apiUrl, credentialId, prefix) {
+async function createExport(config, projectId, description, fields, exportName, jsonData, dbType, exportType, isPrivate, allowedOrigin, apiUrl, credentialId, prefix) {
     const targetDb = config.databases?.find(db => db.type === dbType && db.main) ||
         config.databases?.find(db => db.type === dbType);
     if (!targetDb) {
@@ -57,10 +57,10 @@ async function createExport(config, projectId, exportName, collectionName, jsonD
     // Update the project with the new export reference
     // Assuming project metadata is always in NoSQL (MongoDB)
     const NoSQLProject = (0, manager_1.getModel)('projects', 'nosql');
-    await NoSQLProject.update({ _id: projectId }, { $push: { exports: { id: dbType === 'nosql' ? new mongodb_1.ObjectId(result.exportId) : result.exportId, name: exportName, collectionName: result.collectionName, type: exportType, method: 'GET', private: isPrivate, allowedOrigin: allowedOrigin, apiUrl: apiUrl, credentialId: credentialId, prefix: prefix } } });
+    await NoSQLProject.update({ _id: projectId }, { $push: { exports: { id: dbType === 'nosql' ? new mongodb_1.ObjectId(result.exportId) : result.exportId, name: exportName, collectionName: result.collectionName, type: exportType, method: 'GET', private: isPrivate, allowedOrigin: allowedOrigin, apiUrl: apiUrl, credentialId: credentialId, prefix: prefix, description: description, fields: fields } } });
     return { ...result, message: `${exportType} export created successfully` };
 }
-async function updateExport(config, projectId, exportId, exportName, collectionName, jsonData, dbType, exportType, isPrivate, allowedOrigin, apiUrl, credentialId, prefix) {
+async function updateExport(config, projectId, exportId, description, fields, exportName, collectionName, jsonData, dbType, exportType, isPrivate, allowedOrigin, apiUrl, credentialId, prefix) {
     const targetDb = config.databases?.find(db => db.type === dbType && db.main) ||
         config.databases?.find(db => db.type === dbType);
     if (!targetDb) {
@@ -81,14 +81,14 @@ async function updateExport(config, projectId, exportId, exportName, collectionN
             const db = connection.client.db();
             const updateData = {
                 json: jsonData,
-                name: exportName,
+                description: description,
+                fields: fields,
                 updatedAt: new Date(),
                 apiUrl: apiUrl,
                 credentialId: credentialId,
                 prefix: prefix,
             };
             await db.collection(collectionName).updateOne({ _id: new mongodb_1.ObjectId(exportId) }, { $set: updateData });
-            result = { collectionName, exportId };
         }
         else {
             throw new Error('Unsupported database type for externalApi export update');
@@ -98,11 +98,13 @@ async function updateExport(config, projectId, exportId, exportName, collectionN
         const db = connection.client.db();
         const updateData = {
             json: jsonData,
-            name: exportName,
-            updatedAt: new Date()
+            description: description,
+            fields: fields,
+            apiUrl: apiUrl,
+            credentialId: credentialId,
+            prefix: prefix,
         };
         await db.collection(collectionName).updateOne({ _id: new mongodb_1.ObjectId(exportId) }, { $set: updateData });
-        result = { collectionName, exportId };
     }
     else {
         throw new Error('Unsupported database type for update');
@@ -111,7 +113,8 @@ async function updateExport(config, projectId, exportId, exportName, collectionN
     await NoSQLProject.update({
         _id: new mongodb_1.ObjectId(projectId),
         'exports.id': { $in: [new mongodb_1.ObjectId(exportId), exportId] }
-    }, { $set: { 'exports.$.name': exportName, 'exports.$.collectionName': collectionName, 'exports.$.private': isPrivate, 'exports.$.allowedOrigin': allowedOrigin, 'exports.$.apiUrl': apiUrl, 'exports.$.credentialId': credentialId, 'exports.$.prefix': prefix } });
+    }, { $set: { 'exports.$.name': exportName, 'exports.$.collectionName': collectionName, 'exports.$.private': isPrivate, 'exports.$.allowedOrigin': allowedOrigin, 'exports.$.apiUrl': apiUrl, 'exports.$.credentialId': credentialId, 'exports.$.prefix': prefix, 'exports.$.description': description, 'exports.$.fields': fields } });
+    result = { collectionName, exportId };
     return { ...result, message: `${exportType} export updated successfully` };
 }
 async function deleteExport(config, projectId, exportId, dbType, collectionName) {

package/dist/types/index.d.ts

@@ -87,7 +87,7 @@ export interface Export {
     projectId: string;
     createdAt: Date;
     updatedAt: Date;
-    type: 'structured' | 'raw' | 'json' | 'externalApi';
+    type: 'json' | 'externalApi';
     fields?: FieldDefinition[];
     jsonData?: any;
     private?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "streamby-core",
-  "version": "0.24.14",
+  "version": "0.24.16",
   "description": "StreamBy middleware framework for media storage management",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",