@kubun/plugin-workflow 0.14.0 → 0.15.0

package/lib/engine.js

@@ -398,6 +398,9 @@ export function createWorkflowEngine(deps) {
             }
             registry.set(def.name, erased);
         },
+        isManagedWorkflow (name) {
+            return registry.get(name)?.managed === true;
+        },
         defineQueue,
         async schedule (name, params, when) {
             const s = await store();
@@ -441,28 +444,19 @@ export function createWorkflowEngine(deps) {
             // Deterministic id so a re-arm across restarts targets the same row.
             const id = `${name}:${opts.subjectKey}`;
             const at = now();
-            const existing = await s.getSchedule(id);
-            if (existing == null) {
-                await s.insertSchedule({
-                    id,
-                    workflowName: name,
-                    params,
-                    cron: null,
-                    every: null,
-                    kind: 'adaptive',
-                    policy: opts.policy,
-                    nextRun: at + opts.policy.changed,
-                    enabled: true
-                }, at);
-            } else {
-                // Reactivation: re-arm eagerly, preserving the stored streak.
-                await s.advanceScheduleAdaptive(id, {
-                    nextRun: at + opts.policy.changed,
-                    lastOutcome: existing.last_outcome,
-                    consecutiveCount: existing.consecutive_count
-                }, at);
-                await s.setScheduleEnabled(id, true, at);
-            }
+            // Insert-or-arm in one atomic write: a fresh subject is created armed, an
+            // existing one is re-armed eagerly with its outcome streak preserved.
+            // Concurrent enables of the same subject converge instead of racing to a
+            // PK conflict.
+            await s.upsertAdaptiveSchedule({
+                id,
+                workflowName: name,
+                params,
+                policy: opts.policy,
+                nextRun: at + opts.policy.changed,
+                enabled: true,
+                reactivate: opts.reactivate
+            }, at);
             const handle = {
                 id,
                 async disable () {

package/lib/schema.js

@@ -105,15 +105,37 @@ function requireWorkflow(ctx) {
 function decodeScheduleID(id) {
     return PluginNodeID.fromString(id).localID;
 }
+// Refusal for a managed schedule reached through the generic control surface.
+// A managed schedule is owned by its workflow's plugin and controlled only
+// through that plugin's own owner-scoped path.
+const MANAGED_SCHEDULE_ERROR = 'schedule is managed by its owning plugin';
 export function createWorkflowContextFactory(api) {
+    // A managed schedule is excluded from the generic controls: queries omit it and
+    // mutations refuse it. The connector reaches its own schedules through the
+    // engine WorkflowAPI directly (not this context), so its owner-scoped path is
+    // untouched.
+    const isManaged = (sync)=>sync != null && api.isManagedWorkflow(sync.workflowName);
     return ()=>({
             get: (instanceID)=>api.get(instanceID),
             list: (filter)=>api.list(filter),
             subscribeToWorkflowEvents: (instanceID)=>subscribeToWorkflowEvents(api.events, instanceID),
-            getPeriodicSync: (scheduleID)=>api.getPeriodicSync(scheduleID),
-            listPeriodicSyncs: (workflowName)=>api.listPeriodicSyncs(workflowName),
-            setPeriodicSyncEnabled: (scheduleID, enabled)=>api.setPeriodicSyncEnabled(scheduleID, enabled),
-            setPeriodicSyncPolicy: (scheduleID, policy)=>api.setPeriodicSyncPolicy(scheduleID, policy)
+            getPeriodicSync: async (scheduleID)=>{
+                const sync = await api.getPeriodicSync(scheduleID);
+                return isManaged(sync) ? null : sync;
+            },
+            listPeriodicSyncs: async (workflowName)=>(await api.listPeriodicSyncs(workflowName)).filter((sync)=>!api.isManagedWorkflow(sync.workflowName)),
+            setPeriodicSyncEnabled: async (scheduleID, enabled)=>{
+                if (isManaged(await api.getPeriodicSync(scheduleID))) {
+                    throw new Error(MANAGED_SCHEDULE_ERROR);
+                }
+                return api.setPeriodicSyncEnabled(scheduleID, enabled);
+            },
+            setPeriodicSyncPolicy: async (scheduleID, policy)=>{
+                if (isManaged(await api.getPeriodicSync(scheduleID))) {
+                    throw new Error(MANAGED_SCHEDULE_ERROR);
+                }
+                return api.setPeriodicSyncPolicy(scheduleID, policy);
+            }
         });
 }
 // ms-epoch timestamps are exposed as `Float` (JS number), matching how the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/plugin-workflow",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "keywords": [],
   "license": "see LICENSE.md",
   "sideEffects": false,
@@ -15,21 +15,21 @@
     "LICENSE.md"
   ],
   "dependencies": {
-    "@kubun/db": "^0.14.0",
-    "@kubun/engine": "^0.14.0",
-    "@kubun/graphql": "^0.14.0",
-    "@kubun/id": "^0.14.0",
-    "@kubun/logger": "^0.14.0",
-    "@kubun/plugin-workflow-api": "^0.14.0",
-    "@kubun/store-workflow": "^0.14.0",
+    "@kubun/db": "^0.15.0",
+    "@kubun/engine": "^0.15.0",
+    "@kubun/graphql": "^0.15.0",
+    "@kubun/id": "^0.15.0",
+    "@kubun/logger": "^0.15.0",
+    "@kubun/plugin-workflow-api": "^0.15.0",
+    "@kubun/store-workflow": "^0.15.0",
     "@sozai/event": "^0.1.3",
     "@sozai/flow": "^0.3.1",
     "@sozai/runtime": "^0.1.0",
-    "@sozai/schema": "^0.1.1"
+    "@sozai/schema": "^0.1.2"
   },
   "devDependencies": {
-    "@kubun/db-better-sqlite": "^0.14.0",
-    "@kubun/db-postgres": "^0.14.0",
+    "@kubun/db-better-sqlite": "^0.15.0",
+    "@kubun/db-postgres": "^0.15.0",
     "@testcontainers/postgresql": "^12.1.0"
   },
   "publishConfig": {