@open-mercato/core 0.4.5-develop-995ce486fa → 0.4.5-develop-17cfa89764

package/src/modules/progress/lib/progressServiceImpl.ts

@@ -0,0 +1,261 @@
+import type { EntityManager } from '@mikro-orm/core'
+import { ProgressJob } from '../data/entities'
+import type { ProgressService } from './progressService'
+import { calculateEta, calculateProgressPercent, STALE_JOB_TIMEOUT_SECONDS } from './progressService'
+import { PROGRESS_EVENTS } from './events'
+
+export function createProgressService(em: EntityManager, eventBus: { emit: (event: string, payload: Record<string, unknown>) => Promise<void> }): ProgressService {
+  return {
+    async createJob(input, ctx) {
+      const job = em.create(ProgressJob, {
+        jobType: input.jobType,
+        name: input.name,
+        description: input.description,
+        totalCount: input.totalCount,
+        cancellable: input.cancellable ?? false,
+        meta: input.meta,
+        parentJobId: input.parentJobId,
+        partitionIndex: input.partitionIndex,
+        partitionCount: input.partitionCount,
+        startedByUserId: ctx.userId,
+        tenantId: ctx.tenantId,
+        organizationId: ctx.organizationId,
+        status: 'pending',
+      })
+
+      await em.persistAndFlush(job)
+
+      await eventBus.emit(PROGRESS_EVENTS.JOB_CREATED, {
+        jobId: job.id,
+        jobType: job.jobType,
+        name: job.name,
+        tenantId: ctx.tenantId,
+        organizationId: ctx.organizationId,
+      })
+
+      return job
+    },
+
+    async startJob(jobId, ctx) {
+      const job = await em.findOneOrFail(ProgressJob, { id: jobId, tenantId: ctx.tenantId })
+
+      job.status = 'running'
+      job.startedAt = new Date()
+      job.heartbeatAt = new Date()
+
+      await em.flush()
+
+      await eventBus.emit(PROGRESS_EVENTS.JOB_STARTED, {
+        jobId: job.id,
+        jobType: job.jobType,
+        tenantId: ctx.tenantId,
+      })
+
+      return job
+    },
+
+    async updateProgress(jobId, input, ctx) {
+      const job = await em.findOneOrFail(ProgressJob, { id: jobId, tenantId: ctx.tenantId })
+
+      if (input.processedCount !== undefined) {
+        job.processedCount = input.processedCount
+      }
+      if (input.totalCount !== undefined) {
+        job.totalCount = input.totalCount
+      }
+      if (input.meta !== undefined) {
+        job.meta = { ...job.meta, ...input.meta }
+      }
+
+      if (input.progressPercent !== undefined) {
+        job.progressPercent = input.progressPercent
+      } else if (job.totalCount) {
+        job.progressPercent = calculateProgressPercent(job.processedCount, job.totalCount)
+      }
+
+      if (input.etaSeconds !== undefined) {
+        job.etaSeconds = input.etaSeconds
+      } else if (job.startedAt && job.totalCount) {
+        job.etaSeconds = calculateEta(job.processedCount, job.totalCount, job.startedAt)
+      }
+
+      job.heartbeatAt = new Date()
+
+      await em.flush()
+
+      await eventBus.emit(PROGRESS_EVENTS.JOB_UPDATED, {
+        jobId: job.id,
+        jobType: job.jobType,
+        progressPercent: job.progressPercent,
+        processedCount: job.processedCount,
+        totalCount: job.totalCount,
+        etaSeconds: job.etaSeconds,
+        tenantId: ctx.tenantId,
+      })
+
+      return job
+    },
+
+    async incrementProgress(jobId, delta, ctx) {
+      const job = await em.findOneOrFail(ProgressJob, { id: jobId, tenantId: ctx.tenantId })
+
+      job.processedCount += delta
+      job.heartbeatAt = new Date()
+
+      if (job.totalCount) {
+        job.progressPercent = calculateProgressPercent(job.processedCount, job.totalCount)
+        if (job.startedAt) {
+          job.etaSeconds = calculateEta(job.processedCount, job.totalCount, job.startedAt)
+        }
+      }
+
+      await em.flush()
+
+      await eventBus.emit(PROGRESS_EVENTS.JOB_UPDATED, {
+        jobId: job.id,
+        progressPercent: job.progressPercent,
+        processedCount: job.processedCount,
+        tenantId: ctx.tenantId,
+      })
+
+      return job
+    },
+
+    async completeJob(jobId, input, ctx) {
+      const job = await em.findOne(ProgressJob, { id: jobId, tenantId: ctx.tenantId })
+      if (!job) throw new Error(`Job ${jobId} not found`)
+
+      job.status = 'completed'
+      job.finishedAt = new Date()
+      job.progressPercent = 100
+      job.etaSeconds = 0
+      if (input?.resultSummary) {
+        job.resultSummary = input.resultSummary
+      }
+
+      await em.flush()
+
+      await eventBus.emit(PROGRESS_EVENTS.JOB_COMPLETED, {
+        jobId: job.id,
+        jobType: job.jobType,
+        resultSummary: job.resultSummary,
+        tenantId: ctx.tenantId,
+      })
+
+      return job
+    },
+
+    async failJob(jobId, input, ctx) {
+      const job = await em.findOne(ProgressJob, { id: jobId, tenantId: ctx.tenantId })
+      if (!job) throw new Error(`Job ${jobId} not found`)
+
+      job.status = 'failed'
+      job.finishedAt = new Date()
+      job.errorMessage = input.errorMessage
+      job.errorStack = input.errorStack
+
+      await em.flush()
+
+      await eventBus.emit(PROGRESS_EVENTS.JOB_FAILED, {
+        jobId: job.id,
+        jobType: job.jobType,
+        errorMessage: job.errorMessage,
+        tenantId: ctx.tenantId,
+      })
+
+      return job
+    },
+
+    async cancelJob(jobId, ctx) {
+      const job = await em.findOneOrFail(ProgressJob, {
+        id: jobId,
+        tenantId: ctx.tenantId,
+        cancellable: true,
+        status: { $in: ['pending', 'running'] },
+      })
+
+      job.cancelRequestedAt = new Date()
+      job.cancelledByUserId = ctx.userId
+
+      if (job.status === 'pending') {
+        job.status = 'cancelled'
+        job.finishedAt = new Date()
+      }
+
+      await em.flush()
+
+      await eventBus.emit(PROGRESS_EVENTS.JOB_CANCELLED, {
+        jobId: job.id,
+        jobType: job.jobType,
+        tenantId: ctx.tenantId,
+      })
+
+      return job
+    },
+
+    async isCancellationRequested(jobId) {
+      const job = await em.findOne(ProgressJob, { id: jobId })
+      return job?.cancelRequestedAt != null
+    },
+
+    async getActiveJobs(ctx) {
+      return em.find(ProgressJob, {
+        tenantId: ctx.tenantId,
+        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),
+        status: { $in: ['pending', 'running'] },
+        parentJobId: null,
+      }, {
+        orderBy: { createdAt: 'DESC' },
+        limit: 50,
+      })
+    },
+
+    async getRecentlyCompletedJobs(ctx, sinceSeconds = 30) {
+      const cutoff = new Date(Date.now() - sinceSeconds * 1000)
+      return em.find(ProgressJob, {
+        tenantId: ctx.tenantId,
+        ...(ctx.organizationId ? { organizationId: ctx.organizationId } : {}),
+        status: { $in: ['completed', 'failed'] },
+        finishedAt: { $gte: cutoff },
+        parentJobId: null,
+      }, {
+        orderBy: { finishedAt: 'DESC' },
+        limit: 10,
+      })
+    },
+
+    async getJob(jobId, ctx) {
+      return em.findOne(ProgressJob, {
+        id: jobId,
+        tenantId: ctx.tenantId,
+      })
+    },
+
+    async markStaleJobsFailed(tenantId: string, timeoutSeconds = STALE_JOB_TIMEOUT_SECONDS) {
+      const cutoff = new Date(Date.now() - timeoutSeconds * 1000)
+
+      const staleJobs = await em.find(ProgressJob, {
+        tenantId,
+        status: 'running',
+        heartbeatAt: { $lt: cutoff },
+      })
+
+      for (const job of staleJobs) {
+        job.status = 'failed'
+        job.finishedAt = new Date()
+        job.errorMessage = `Job stale: no heartbeat for ${timeoutSeconds} seconds`
+
+        await eventBus.emit(PROGRESS_EVENTS.JOB_FAILED, {
+          jobId: job.id,
+          jobType: job.jobType,
+          errorMessage: job.errorMessage,
+          tenantId: job.tenantId,
+          stale: true,
+        })
+      }
+
+      await em.flush()
+      return staleJobs.length
+    },
+  }
+}

package/src/modules/progress/migrations/.snapshot-open-mercato.json

@@ -0,0 +1,316 @@
+{
+  "namespaces": [
+    "public"
+  ],
+  "name": "public",
+  "tables": [
+    {
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "gen_random_uuid()",
+          "mappedType": "uuid"
+        },
+        "job_type": {
+          "name": "job_type",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "text"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "text"
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "'pending'",
+          "mappedType": "text"
+        },
+        "progress_percent": {
+          "name": "progress_percent",
+          "type": "smallint",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "0",
+          "mappedType": "smallint"
+        },
+        "processed_count": {
+          "name": "processed_count",
+          "type": "int",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "0",
+          "mappedType": "integer"
+        },
+        "total_count": {
+          "name": "total_count",
+          "type": "int",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "integer"
+        },
+        "eta_seconds": {
+          "name": "eta_seconds",
+          "type": "int",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "integer"
+        },
+        "started_by_user_id": {
+          "name": "started_by_user_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "heartbeat_at": {
+          "name": "heartbeat_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "finished_at": {
+          "name": "finished_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "result_summary": {
+          "name": "result_summary",
+          "type": "jsonb",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "json"
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "error_stack": {
+          "name": "error_stack",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "meta": {
+          "name": "meta",
+          "type": "jsonb",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "json"
+        },
+        "cancellable": {
+          "name": "cancellable",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
+        },
+        "cancelled_by_user_id": {
+          "name": "cancelled_by_user_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
+        },
+        "cancel_requested_at": {
+          "name": "cancel_requested_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "parent_job_id": {
+          "name": "parent_job_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
+        },
+        "partition_index": {
+          "name": "partition_index",
+          "type": "int",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "integer"
+        },
+        "partition_count": {
+          "name": "partition_count",
+          "type": "int",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "integer"
+        },
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 6,
+          "mappedType": "datetime"
+        }
+      },
+      "name": "progress_jobs",
+      "schema": "public",
+      "indexes": [
+        {
+          "keyName": "progress_jobs_parent_idx",
+          "columnNames": [
+            "parent_job_id"
+          ],
+          "composite": false,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
+        {
+          "keyName": "progress_jobs_type_tenant_idx",
+          "columnNames": [
+            "job_type",
+            "tenant_id"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
+        {
+          "keyName": "progress_jobs_status_tenant_idx",
+          "columnNames": [
+            "status",
+            "tenant_id"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
+        {
+          "keyName": "progress_jobs_pkey",
+          "columnNames": [
+            "id"
+          ],
+          "composite": false,
+          "constraint": true,
+          "primary": true,
+          "unique": true
+        }
+      ],
+      "checks": [],
+      "foreignKeys": {},
+      "nativeEnums": {}
+    }
+  ],
+  "nativeEnums": {}
+}

package/src/modules/progress/migrations/Migration20260220214819.ts

@@ -0,0 +1,15 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260220214819 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`create table "progress_jobs" ("id" uuid not null default gen_random_uuid(), "job_type" text not null, "name" text not null, "description" text null, "status" text not null default 'pending', "progress_percent" smallint not null default 0, "processed_count" int not null default 0, "total_count" int null, "eta_seconds" int null, "started_by_user_id" uuid null, "started_at" timestamptz null, "heartbeat_at" timestamptz null, "finished_at" timestamptz null, "result_summary" jsonb null, "error_message" text null, "error_stack" text null, "meta" jsonb null, "cancellable" boolean not null default false, "cancelled_by_user_id" uuid null, "cancel_requested_at" timestamptz null, "parent_job_id" uuid null, "partition_index" int null, "partition_count" int null, "tenant_id" uuid not null, "organization_id" uuid null, "created_at" timestamptz not null, "updated_at" timestamptz not null, constraint "progress_jobs_pkey" primary key ("id"));`);
+    this.addSql(`create index "progress_jobs_parent_idx" on "progress_jobs" ("parent_job_id");`);
+    this.addSql(`create index "progress_jobs_type_tenant_idx" on "progress_jobs" ("job_type", "tenant_id");`);
+    this.addSql(`create index "progress_jobs_status_tenant_idx" on "progress_jobs" ("status", "tenant_id");`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop table if exists "progress_jobs";`);
+  }
+}

package/src/modules/progress/setup.ts

@@ -0,0 +1,10 @@
+import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'
+
+export const setup: ModuleSetupConfig = {
+  defaultRoleFeatures: {
+    admin: ['progress.*'],
+    employee: ['progress.view'],
+  },
+}
+
+export default setup