@friggframework/core 2.0.0--canary.522.cbd3d5a.0 → 2.0.0--canary.517.35ee143.0

package/prisma-postgresql/schema.prisma

@@ -78,26 +78,6 @@ model Token {
   @@index([expires])
 }
 
-/// Multi-step authorization session tracking
-/// Supports OTP flows and multi-stage authentication (e.g., Nagaris)
-model AuthorizationSession {
-  id          Int      @id @default(autoincrement())
-  sessionId   String   @unique
-  userId      String
-  entityType  String
-  currentStep Int      @default(1)
-  maxSteps    Int
-  stepData    Json     @default("{}")
-  expiresAt   DateTime
-  completed   Boolean  @default(false)
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
-
-  @@index([sessionId])
-  @@index([userId, entityType])
-  @@index([expiresAt])
-}
-
 // ============================================================================
 // CREDENTIAL & ENTITY MODELS
 // ============================================================================
@@ -135,7 +115,6 @@ model Entity {
   name         String?
   moduleName   String?
   externalId   String?
-  isGlobal     Boolean     @default(false)
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -151,8 +130,6 @@ model Entity {
   @@index([externalId])
   @@index([moduleName])
   @@index([credentialId])
-  @@index([isGlobal])
-  @@index([isGlobal, moduleName])
 }
 
 // ============================================================================
@@ -366,68 +343,51 @@ model WebsocketConnection {
 }
 
 // ============================================================================
-// ADMIN SCRIPT RUNNER MODELS
+// ADMIN PROCESS MODELS
 // ============================================================================
 
-enum ScriptExecutionStatus {
+/// Admin process state machine
+enum AdminProcessState {
   PENDING
   RUNNING
   COMPLETED
   FAILED
-  TIMEOUT
-  CANCELLED
 }
 
-enum ScriptTrigger {
+/// Admin trigger types
+enum AdminTrigger {
   MANUAL
   SCHEDULED
   QUEUE
   WEBHOOK
 }
 
-/// Admin API keys for script execution authentication
-/// Key hashes stored with bcrypt
-model AdminApiKey {
-  id         Int       @id @default(autoincrement())
-  keyHash    String    @unique
-  keyLast4   String
-  name       String
-  scopes     String[]
-  expiresAt  DateTime?
-  createdBy  String?
-  lastUsedAt DateTime?
-  isActive   Boolean   @default(true)
-  createdAt  DateTime  @default(now())
-  updatedAt  DateTime  @updatedAt
-
-  @@index([isActive])
-}
+/// Admin process tracking (like Process but without user/integration FK)
+/// Used for: admin scripts, db migrations, system maintenance tasks
+model AdminProcess {
+  id   Int    @id @default(autoincrement())
+  name String // e.g., "oauth-token-refresh", "db-migration-xyz"
+  type String // e.g., "ADMIN_SCRIPT", "DB_MIGRATION"
 
-/// Script execution tracking and audit log
-model ScriptExecution {
-  id                Int                   @id @default(autoincrement())
-  scriptName        String
-  scriptVersion     String?
-  status            ScriptExecutionStatus @default(PENDING)
-  trigger           ScriptTrigger
-  mode              String                @default("async")
-  input             Json?
-  output            Json?
-  logs              Json[]
-  metricsStartTime  DateTime?
-  metricsEndTime    DateTime?
-  metricsDurationMs Int?
-  errorName         String?
-  errorMessage      String?
-  errorStack        String?
-  auditApiKeyName   String?
-  auditApiKeyLast4  String?
-  auditIpAddress    String?
-  createdAt         DateTime              @default(now())
-  updatedAt         DateTime              @updatedAt
-
-  @@index([scriptName, createdAt(sort: Desc)])
-  @@index([status])
+  // State machine
+  state AdminProcessState @default(PENDING)
+
+  // Flexible storage (mirrors Process model pattern)
+  context Json @default("{}") // input, trigger, audit info, script version
+  results Json @default("{}") // output, logs, metrics, errors
+
+  // Hierarchy support - self-referential relation
+  parentProcessId Int?
+  parentProcess   AdminProcess?  @relation("AdminProcessHierarchy", fields: [parentProcessId], references: [id], onDelete: SetNull)
+  childProcesses  AdminProcess[] @relation("AdminProcessHierarchy")
+
+  // Timestamps
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@index([name, createdAt(sort: Desc)])
+  @@index([state])
+  @@index([type])
 }
 
 /// Script scheduling configuration for hybrid scheduling (SQS + EventBridge)
@@ -440,9 +400,9 @@ model ScriptSchedule {
   lastTriggeredAt DateTime?
   nextTriggerAt   DateTime?
 
-  // AWS EventBridge Schedule (if provisioned)
-  awsScheduleArn  String?
-  awsScheduleName String?
+  // External Scheduler (e.g., AWS EventBridge Scheduler)
+  externalScheduleId   String?
+  externalScheduleName String?
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt

package/queues/queuer-util.js

@@ -1,9 +1,5 @@
 const { v4: uuid } = require('uuid');
-const {
-    SQSClient,
-    SendMessageCommand,
-    SendMessageBatchCommand,
-} = require('@aws-sdk/client-sqs');
+const { SQSClient, SendMessageCommand, SendMessageBatchCommand } = require('@aws-sdk/client-sqs');
 
 const awsConfigOptions = () => {
     const config = {};

package/syncs/model.js

@@ -1,62 +1,62 @@
-const mongoose = require('mongoose');
+const mongoose = require("mongoose");
 
 const schema = new mongoose.Schema({
-    entities: [
-        { type: mongoose.Schema.Types.ObjectId, ref: 'Entity', required: true },
-    ],
-    hash: { type: String, required: true },
-    name: { type: String, required: true },
-    dataIdentifiers: [
-        {
-            entity: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: 'Entity',
-                required: true,
-            },
-            id: { type: Object, required: true },
-            hash: { type: String, required: true },
-        },
-    ],
+  entities: [
+    { type: mongoose.Schema.Types.ObjectId, ref: "Entity", required: true },
+  ],
+  hash: { type: String, required: true },
+  name: { type: String, required: true },
+  dataIdentifiers: [
+    {
+      entity: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "Entity",
+        required: true,
+      },
+      id: { type: Object, required: true },
+      hash: { type: String, required: true },
+    },
+  ],
 });
 
 schema.statics({
-    getSyncObject: async function (name, dataIdentifier, entity) {
-        // const syncList = await this.list({name:name,entities: {"$in": entities}, "entityIds.idHash":entityIdHash });
-        const syncList = await this.find({
-            name: name,
-            dataIdentifiers: { $elemMatch: { id: dataIdentifier, entity } },
-        });
+  getSyncObject: async function (name, dataIdentifier, entity) {
+    // const syncList = await this.list({name:name,entities: {"$in": entities}, "entityIds.idHash":entityIdHash });
+    const syncList = await this.find({
+      name: name,
+      dataIdentifiers: { $elemMatch: { id: dataIdentifier, entity } },
+    });
 
-        if (syncList.length === 1) {
-            return syncList[0];
-        } else if (syncList.length === 0) {
-            return null;
-        } else {
-            throw new Error(
-                `There are multiple sync objects with the name ${name}, for entities [${syncList[0].entities}] [${syncList[1].entities}]`
-            );
-        }
-    },
+    if (syncList.length === 1) {
+      return syncList[0];
+    } else if (syncList.length === 0) {
+      return null;
+    } else {
+      throw new Error(
+        `There are multiple sync objects with the name ${name}, for entities [${syncList[0].entities}] [${syncList[1].entities}]`
+      );
+    }
+  },
 
-    addDataIdentifier: async function (id, dataIdentifier) {
-        return await this.update(
-            { _id: id },
-            {},
-            { dataIdentifiers: dataIdentifier }
-        );
-    },
+  addDataIdentifier: async function (id, dataIdentifier) {
+    return await this.update(
+      { _id: id },
+      {},
+      { dataIdentifiers: dataIdentifier }
+    );
+  },
 
-    getEntityObjIdForEntityIdFromObject: function (syncObj, entityId) {
-        for (let dataIdentifier of syncObj.dataIdentifiers) {
-            if (dataIdentifier.entity.toString() === entityId) {
-                return dataIdentifier.id;
-            }
-        }
-        throw new Error(
-            `Sync object does not have DataIdentifier for entityId: ${entityId}`
-        );
-    },
+  getEntityObjIdForEntityIdFromObject: function (syncObj, entityId) {
+    for (let dataIdentifier of syncObj.dataIdentifiers) {
+      if (dataIdentifier.entity.toString() === entityId) {
+        return dataIdentifier.id;
+      }
+    }
+    throw new Error(
+      `Sync object does not have DataIdentifier for entityId: ${entityId}`
+    );
+  },
 });
 
-const Sync = mongoose.models.Sync || mongoose.model('Sync', schema);
+const Sync = mongoose.models.Sync || mongoose.model("Sync", schema);
 module.exports = { Sync };

package/syncs/repositories/sync-repository-documentdb.js

@@ -69,9 +69,7 @@ class SyncRepositoryDocumentDB extends SyncRepositoryInterface {
                     $set: documentData,
                 }
             );
-            const updated = await findOne(this.prisma, 'Sync', {
-                _id: existing._id,
-            });
+            const updated = await findOne(this.prisma, 'Sync', { _id: existing._id });
             return this._mapSync(updated);
         }
 
@@ -105,9 +103,7 @@ class SyncRepositoryDocumentDB extends SyncRepositoryInterface {
         const doc = await findOne(this.prisma, 'Sync', { _id: syncObjectId });
         if (!doc) return null;
 
-        const identifiers = Array.isArray(doc.dataIdentifiers)
-            ? [...doc.dataIdentifiers]
-            : [];
+        const identifiers = Array.isArray(doc.dataIdentifiers) ? [...doc.dataIdentifiers] : [];
         identifiers.push({
             syncId: syncObjectId,
             entityId: toObjectId(dataIdentifier.entity),
@@ -128,9 +124,7 @@ class SyncRepositoryDocumentDB extends SyncRepositoryInterface {
             }
         );
 
-        const updated = await findOne(this.prisma, 'Sync', {
-            _id: syncObjectId,
-        });
+        const updated = await findOne(this.prisma, 'Sync', { _id: syncObjectId });
         return updated ? this._mapSync(updated) : null;
     }
 
@@ -140,8 +134,7 @@ class SyncRepositoryDocumentDB extends SyncRepositoryInterface {
         }
 
         const entry = syncObj.dataIdentifiers.find(
-            (identifier) =>
-                fromObjectId(identifier.entityId) === String(entityId)
+            (identifier) => fromObjectId(identifier.entityId) === String(entityId)
         );
 
         if (entry) {
@@ -185,9 +178,7 @@ class SyncRepositoryDocumentDB extends SyncRepositoryInterface {
             query.integrationId = toObjectId(filter.integrationId);
         }
         if (filter.entities) {
-            query.entityIds = (filter.entities || [])
-                .map((id) => toObjectId(id))
-                .filter(Boolean);
+            query.entityIds = (filter.entities || []).map((id) => toObjectId(id)).filter(Boolean);
             delete query.entities;
         }
         return query;
@@ -199,11 +190,8 @@ class SyncRepositoryDocumentDB extends SyncRepositoryInterface {
             prepared.integrationId = toObjectId(data.integrationId);
         }
         if (data.entities !== undefined || data.entityIds !== undefined) {
-            const list =
-                data.entities !== undefined ? data.entities : data.entityIds;
-            prepared.entityIds = (list || [])
-                .map((id) => toObjectId(id))
-                .filter(Boolean);
+            const list = data.entities !== undefined ? data.entities : data.entityIds;
+            prepared.entityIds = (list || []).map((id) => toObjectId(id)).filter(Boolean);
         }
         if (data.hash !== undefined) prepared.hash = data.hash;
         if (data.name !== undefined) prepared.name = data.name;
@@ -211,17 +199,13 @@ class SyncRepositoryDocumentDB extends SyncRepositoryInterface {
         if (data.results !== undefined) prepared.results = data.results;
         if (timestamp) prepared.updatedAt = timestamp;
         if (data.dataIdentifiers !== undefined) {
-            prepared.dataIdentifiers = (data.dataIdentifiers || []).map(
-                (identifier) => ({
-                    syncId: toObjectId(identifier.syncId),
-                    entityId: toObjectId(identifier.entityId),
-                    idData: identifier.idData,
-                    hash: identifier.hash,
-                    createdAt: identifier.createdAt
-                        ? new Date(identifier.createdAt)
-                        : new Date(),
-                })
-            );
+            prepared.dataIdentifiers = (data.dataIdentifiers || []).map((identifier) => ({
+                syncId: toObjectId(identifier.syncId),
+                entityId: toObjectId(identifier.entityId),
+                idData: identifier.idData,
+                hash: identifier.hash,
+                createdAt: identifier.createdAt ? new Date(identifier.createdAt) : new Date(),
+            }));
         }
         return prepared;
     }
@@ -230,9 +214,7 @@ class SyncRepositoryDocumentDB extends SyncRepositoryInterface {
         if (!doc) return null;
         return {
             id: fromObjectId(doc._id),
-            integrationId: doc.integrationId
-                ? fromObjectId(doc.integrationId)
-                : null,
+            integrationId: doc.integrationId ? fromObjectId(doc.integrationId) : null,
             entities: Array.isArray(doc.entityIds)
                 ? doc.entityIds.map((id) => fromObjectId(id))
                 : [],
@@ -243,12 +225,8 @@ class SyncRepositoryDocumentDB extends SyncRepositoryInterface {
             name: doc.name ?? null,
             dataIdentifiers: Array.isArray(doc.dataIdentifiers)
                 ? doc.dataIdentifiers.map((identifier) => ({
-                      syncId: identifier.syncId
-                          ? fromObjectId(identifier.syncId)
-                          : null,
-                      entityId: identifier.entityId
-                          ? fromObjectId(identifier.entityId)
-                          : null,
+                      syncId: identifier.syncId ? fromObjectId(identifier.syncId) : null,
+                      entityId: identifier.entityId ? fromObjectId(identifier.entityId) : null,
                       idData: identifier.idData,
                       hash: identifier.hash,
                   }))
@@ -258,3 +236,5 @@ class SyncRepositoryDocumentDB extends SyncRepositoryInterface {
 }
 
 module.exports = { SyncRepositoryDocumentDB };
+
+

package/syncs/repositories/sync-repository-interface.js

@@ -56,9 +56,7 @@ class SyncRepositoryInterface {
      * @abstract
      */
     async addDataIdentifier(syncId, dataIdentifier) {
-        throw new Error(
-            'Method addDataIdentifier must be implemented by subclass'
-        );
+        throw new Error('Method addDataIdentifier must be implemented by subclass');
     }
 
     /**
@@ -71,9 +69,7 @@ class SyncRepositoryInterface {
      * @abstract
      */
     getEntityObjIdForEntityIdFromObject(syncObj, entityId) {
-        throw new Error(
-            'Method getEntityObjIdForEntityIdFromObject must be implemented by subclass'
-        );
+        throw new Error('Method getEntityObjIdForEntityIdFromObject must be implemented by subclass');
     }
 
     /**

package/syncs/repositories/sync-repository-postgres.js

@@ -46,26 +46,24 @@ class SyncRepositoryPostgres extends SyncRepositoryInterface {
             ...sync,
             id: sync.id?.toString(),
             integrationId: sync.integrationId?.toString(),
-            entities: sync.entities?.map((e) => ({
+            entities: sync.entities?.map(e => ({
                 ...e,
                 id: e.id?.toString(),
                 userId: e.userId?.toString(),
-                credentialId: e.credentialId?.toString(),
+                credentialId: e.credentialId?.toString()
             })),
-            dataIdentifiers: sync.dataIdentifiers?.map((di) => ({
+            dataIdentifiers: sync.dataIdentifiers?.map(di => ({
                 ...di,
                 id: di.id?.toString(),
                 syncId: di.syncId?.toString(),
                 entityId: di.entityId?.toString(),
-                entity: di.entity
-                    ? {
-                          ...di.entity,
-                          id: di.entity.id?.toString(),
-                          userId: di.entity.userId?.toString(),
-                          credentialId: di.entity.credentialId?.toString(),
-                      }
-                    : di.entity,
-            })),
+                entity: di.entity ? {
+                    ...di.entity,
+                    id: di.entity.id?.toString(),
+                    userId: di.entity.userId?.toString(),
+                    credentialId: di.entity.credentialId?.toString()
+                } : di.entity
+            }))
         };
     }
 
@@ -125,9 +123,7 @@ class SyncRepositoryPostgres extends SyncRepositoryInterface {
         // Convert IDs in syncData if present
         const convertedData = { ...syncData };
         if (convertedData.integrationId) {
-            convertedData.integrationId = this._convertId(
-                convertedData.integrationId
-            );
+            convertedData.integrationId = this._convertId(convertedData.integrationId);
         }
 
         if (existing) {
@@ -159,9 +155,7 @@ class SyncRepositoryPostgres extends SyncRepositoryInterface {
         // Convert IDs in updates if present
         const convertedUpdates = { ...updates };
         if (convertedUpdates.integrationId) {
-            convertedUpdates.integrationId = this._convertId(
-                convertedUpdates.integrationId
-            );
+            convertedUpdates.integrationId = this._convertId(convertedUpdates.integrationId);
         }
 
         const updated = await this.prisma.sync.update({
@@ -247,7 +241,7 @@ class SyncRepositoryPostgres extends SyncRepositoryInterface {
                 },
             },
         });
-        return syncs.map((sync) => this._convertSyncIds(sync));
+        return syncs.map(sync => this._convertSyncIds(sync));
     }
 
     /**