@frogbotai/db-mongodb 0.33.0 → 0.34.0

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAmB,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,eAAe,IAAI,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAGlF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAQpD,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,eAAO,MAAM,eAAe,SACpB,IAAI,KACT,UAAU,CAAC,OAAO,qBAAqB,CAAC,GAAG;IAAE,MAAM,EAAE,aAAa,CAAA;CA4BpE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAmB,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,eAAe,IAAI,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAGlF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAOpD,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,eAAO,MAAM,eAAe,GAC1B,MAAM,IAAI,KACT,UAAU,CAAC,OAAO,qBAAqB,CAAC,GAAG;IAAE,MAAM,EAAE,aAAa,CAAA;CAuBpE,CAAC"}

package/dist/index.js

@@ -1,9 +1,8 @@
 import { mongooseAdapter as createMongooseAdapter } from '@payloadcms/db-mongodb';
-import { jobLeaseOperations, jobLogOperations } from 'frogbot/jobs';
+import { jobLogOperations } from 'frogbot/jobs';
 import { installJobIndexes } from './jobIndexes.js';
 import { pruneJobLogs } from './jobLogs.js';
 import { mongooseSearchAdapter } from './search/index.js';
-import { updateJobLeases } from './updateJobLeases.js';
 import { createUpdateJobs } from './updateJobs.js';
 export { compatibilityOptions } from '@payloadcms/db-mongodb';
 export const mongooseAdapter = (args)=>{
@@ -16,12 +15,6 @@ export const mongooseAdapter = (args)=>{
             database.packageName = '@frogbotai/db-mongodb';
             installJobIndexes(database);
             database.updateJobs = createUpdateJobs(database);
-            database[jobLeaseOperations] = {
-                update: (args)=>updateJobLeases({
-                        adapter: database,
-                        ...args
-                    })
-            };
             database[jobLogOperations] = {
                 prune: (args)=>pruneJobLogs({
                         adapter: database,

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":["mongooseAdapter","createMongooseAdapter","jobLeaseOperations","jobLogOperations","installJobIndexes","pruneJobLogs","mongooseSearchAdapter","updateJobLeases","createUpdateJobs","compatibilityOptions","args","init","adapter","search","initArgs","database","packageName","updateJobs","update","prune"],"mappings":"AACA,SAASA,mBAAmBC,qBAAqB,QAAQ,yBAAyB;AAElF,SAASC,kBAAkB,EAAEC,gBAAgB,QAAQ,eAAe;AAGpE,SAASC,iBAAiB,QAAQ,kBAAkB;AACpD,SAASC,YAAY,QAAQ,eAAe;AAC5C,SAASC,qBAAqB,QAAQ,oBAAoB;AAC1D,SAASC,eAAe,QAAQ,uBAAuB;AACvD,SAASC,gBAAgB,QAAQ,kBAAkB;AAGnD,SAASC,oBAAoB,QAAQ,yBAAyB;AAE9D,OAAO,MAAMT,kBAAkB,CAC7BU;IAEA,MAAM,EAAEC,IAAI,EAAE,GAAGC,SAAS,GAAGX,sBAAsBS;IAEnD,OAAO;QACL,GAAGE,OAAO;QACVC,QAAQP;QACRK,MAAKG,QAAQ;YACX,MAAMC,WAAWJ,KAAKG;YAItBC,SAASC,WAAW,GAAG;YAEvBZ,kBAAkBW;YAElBA,SAASE,UAAU,GAAGT,iBAAiBO;YAEvCA,QAAQ,CAACb,mBAAmB,GAAG;gBAC7BgB,QAAQ,CAACR,OAASH,gBAAgB;wBAAEK,SAASG;wBAAU,GAAGL,IAAI;oBAAC;YACjE;YAEAK,QAAQ,CAACZ,iBAAiB,GAAG;gBAC3BgB,OAAO,CAACT,OAASL,aAAa;wBAAEO,SAASG;wBAAU,GAAGL,IAAI;oBAAC;YAC7D;YAEA,OAAOK;QACT;IACF;AACF,EAAE","file":"index.js"}
+{"version":3,"sources":["../src/index.ts"],"names":["mongooseAdapter","createMongooseAdapter","jobLogOperations","installJobIndexes","pruneJobLogs","mongooseSearchAdapter","createUpdateJobs","compatibilityOptions","args","init","adapter","search","initArgs","database","packageName","updateJobs","prune"],"mappings":"AACA,SAASA,mBAAmBC,qBAAqB,QAAQ,yBAAyB;AAElF,SAASC,gBAAgB,QAAQ,eAAe;AAGhD,SAASC,iBAAiB,QAAQ,kBAAkB;AACpD,SAASC,YAAY,QAAQ,eAAe;AAC5C,SAASC,qBAAqB,QAAQ,oBAAoB;AAC1D,SAASC,gBAAgB,QAAQ,kBAAkB;AAGnD,SAASC,oBAAoB,QAAQ,yBAAyB;AAE9D,OAAO,MAAMP,kBAAkB,CAC7BQ;IAEA,MAAM,EAAEC,IAAI,EAAE,GAAGC,SAAS,GAAGT,sBAAsBO;IAEnD,OAAO;QACL,GAAGE,OAAO;QACVC,QAAQN;QACRI,MAAKG,QAAQ;YACX,MAAMC,WAAWJ,KAAKG;YAGtBC,SAASC,WAAW,GAAG;YAEvBX,kBAAkBU;YAElBA,SAASE,UAAU,GAAGT,iBAAiBO;YAEvCA,QAAQ,CAACX,iBAAiB,GAAG;gBAC3Bc,OAAO,CAACR,OAASJ,aAAa;wBAAEM,SAASG;wBAAU,GAAGL,IAAI;oBAAC;YAC7D;YAEA,OAAOK;QACT;IACF;AACF,EAAE","file":"index.js"}

package/dist/updateJobs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateJobs.d.ts","sourceRoot":"","sources":["../src/updateJobs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAQ9D,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,eAAe,CAAC,YAAY,CAAC,CA8ExF"}
+{"version":3,"file":"updateJobs.d.ts","sourceRoot":"","sources":["../src/updateJobs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAQ9D,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,eAAe,CAAC,YAAY,CAAC,CA6DxF"}

package/dist/updateJobs.js

@@ -1,14 +1,10 @@
 import { transform } from '@payloadcms/db-mongodb/internal';
-import { getJobClaimFields, getJobLeaseContext, recordJobClaims } from 'frogbot/jobs';
+import { isJobClaim, unleased } from 'frogbot/jobs';
 import { getJobModel, getJobSession, transformJobUpdate } from './jobModel.js';
 export function createUpdateJobs(adapter) {
     const updateJobs = adapter.updateJobs;
     return async (args)=>{
-        if (args.data.processing !== true) return updateJobs.call(adapter, args);
-        const context = getJobLeaseContext();
-        if (!context || context.payload !== adapter.payload) {
-            throw new Error('FrogBot job claims require an active jobs run for this runtime.');
-        }
+        if (!isJobClaim(args.data)) return updateJobs.call(adapter, args);
         const { id, limit, req, returning, sort } = args;
         const { fields, Model } = getJobModel(adapter);
         const where = {
@@ -21,11 +17,7 @@ export function createUpdateJobs(adapter) {
                         }
                     }
                 ] : [],
-                {
-                    processing: {
-                        equals: false
-                    }
-                }
+                unleased(new Date().toISOString())
             ]
         };
         const query = await Model.buildQuery({
@@ -51,15 +43,11 @@ export function createUpdateJobs(adapter) {
             },
             req
         })).docs;
-        const data = {
-            ...args.data
-        };
-        if (!(Array.isArray(data.log) && data.log.length) && !(data.log && typeof data.log === 'object' && '$push' in data.log)) {
-            delete data.log;
-        }
         const update = transformJobUpdate({
             adapter,
-            data
+            data: {
+                ...args.data
+            }
         });
         const result = [];
         for (const candidate of candidates){
@@ -76,13 +64,7 @@ export function createUpdateJobs(adapter) {
                     query,
                     candidateQuery
                 ]
-            }, {
-                ...update,
-                $set: {
-                    ...update.$set,
-                    ...getJobClaimFields()
-                }
-            }, {
+            }, update, {
                 session,
                 timestamps: false,
                 new: true
@@ -94,9 +76,6 @@ export function createUpdateJobs(adapter) {
                 fields,
                 operation: 'read'
             });
-            recordJobClaims([
-                doc.id
-            ]);
             result.push(doc);
         }
         return returning === false ? null : result;

package/dist/updateJobs.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/updateJobs.ts"],"names":["transform","getJobClaimFields","getJobLeaseContext","recordJobClaims","getJobModel","getJobSession","transformJobUpdate","createUpdateJobs","adapter","updateJobs","args","data","processing","call","context","payload","Error","id","limit","req","returning","sort","fields","Model","where","and","undefined","equals","query","buildQuery","session","candidates","find","collection","pagination","select","docs","Array","isArray","log","length","update","result","candidate","candidateQuery","doc","findOneAndUpdate","$and","$set","timestamps","new","lean","operation","push"],"mappings":"AACA,SAASA,SAAS,QAAQ,kCAAkC;AAC5D,SAASC,iBAAiB,EAAEC,kBAAkB,EAAEC,eAAe,QAAQ,eAAe;AAEtF,SAASC,WAAW,EAAEC,aAAa,EAAEC,kBAAkB,QAAQ,gBAAgB;AAI/E,OAAO,SAASC,iBAAiBC,OAAwB;IACvD,MAAMC,aAAaD,QAAQC,UAAU;IAErC,OAAO,OAAOC;QACZ,IAAIA,KAAKC,IAAI,CAACC,UAAU,KAAK,MAAM,OAAOH,WAAWI,IAAI,CAACL,SAASE;QAEnE,MAAMI,UAAUZ;QAEhB,IAAI,CAACY,WAAWA,QAAQC,OAAO,KAAKP,QAAQO,OAAO,EAAE;YACnD,MAAM,IAAIC,MAAM;QAClB;QAEA,MAAM,EAAEC,EAAE,EAAEC,KAAK,EAAEC,GAAG,EAAEC,SAAS,EAAEC,IAAI,EAAE,GAAGX;QAC5C,MAAM,EAAEY,MAAM,EAAEC,KAAK,EAAE,GAAGnB,YAAYI;QAEtC,MAAMgB,QAAQ;YACZC,KAAK;gBACHf,KAAKc,KAAK,IAAI,CAAC;mBACXP,OAAOS,YAAY;oBAAC;wBAAET,IAAI;4BAAEU,QAAQV;wBAAG;oBAAE;iBAAE,GAAG,EAAE;gBACpD;oBAAEL,YAAY;wBAAEe,QAAQ;oBAAM;gBAAE;aACjC;QACH;QAEA,MAAMC,QAAQ,MAAML,MAAMM,UAAU,CAAC;YAAEd,SAASP,QAAQO,OAAO;YAAES;QAAM;QAEvE,MAAMM,UAAU,MAAMzB,cAAc;YAAEG;YAASW;QAAI;QAEnD,MAAMY,aACJd,OAAOS,YACH;YAAC;gBAAET;YAAG;SAAE,GACR,AACE,CAAA,MAAMT,QAAQwB,IAAI,CAAC;YACjBC,YAAY;YACZT;YACAH;YACAH,OAAO,OAAOA,UAAU,YAAYA,QAAQ,IAAIA,QAAQ;YACxDgB,YAAY;YACZC,QAAQ;gBAAElB,IAAI;YAAK;YACnBE;QACF,EAAC,EACDiB,IAAI;QAEZ,MAAMzB,OAAO;YAAE,GAAGD,KAAKC,IAAI;QAAC;QAE5B,IACE,CAAE0B,CAAAA,MAAMC,OAAO,CAAC3B,KAAK4B,GAAG,KAAK5B,KAAK4B,GAAG,CAACC,MAAM,AAAD,KAC3C,CAAE7B,CAAAA,KAAK4B,GAAG,IAAI,OAAO5B,KAAK4B,GAAG,KAAK,YAAY,WAAW5B,KAAK4B,GAAG,AAAD,GAChE;YACA,OAAO5B,KAAK4B,GAAG;QACjB;QAEA,MAAME,SAASnC,mBAAmB;YAAEE;YAASG;QAAK;QAElD,MAAM+B,SAAqB,EAAE;QAE7B,KAAK,MAAMC,aAAaZ,WAAY;YAClC,MAAMa,iBAAiB,MAAMrB,MAAMM,UAAU,CAAC;gBAC5Cd,SAASP,QAAQO,OAAO;gBACxBS,OAAO;oBAAEP,IAAI;wBAAEU,QAAQgB,UAAU1B,EAAE;oBAAC;gBAAE;YACxC;YAEA,MAAM4B,MAAM,MAAMtB,MAAMuB,gBAAgB,CACtC;gBAAEC,MAAM;oBAACnB;oBAAOgB;iBAAe;YAAC,GAChC;gBAAE,GAAGH,MAAM;gBAAEO,MAAM;oBAAE,GAAGP,OAAOO,IAAI;oBAAE,GAAG/C,mBAAmB;gBAAC;YAAE,GAC9D;gBAAE6B;gBAASmB,YAAY;gBAAOC,KAAK;YAAK,GACxCC,IAAI;YAEN,IAAI,CAACN,KAAK;YAEV7C,UAAU;gBAAEQ;gBAASG,MAAMkC;gBAAKvB;gBAAQ8B,WAAW;YAAO;YAE1DjD,gBAAgB;gBAAC0C,IAAI5B,EAAE;aAAC;YAExByB,OAAOW,IAAI,CAACR;QACd;QAEA,OAAOzB,cAAc,QAAQ,OAAOsB;IACtC;AACF","file":"updateJobs.js"}
+{"version":3,"sources":["../src/updateJobs.ts"],"names":["transform","isJobClaim","unleased","getJobModel","getJobSession","transformJobUpdate","createUpdateJobs","adapter","updateJobs","args","data","call","id","limit","req","returning","sort","fields","Model","where","and","undefined","equals","Date","toISOString","query","buildQuery","payload","session","candidates","find","collection","pagination","select","docs","update","result","candidate","candidateQuery","doc","findOneAndUpdate","$and","timestamps","new","lean","operation","push"],"mappings":"AACA,SAASA,SAAS,QAAQ,kCAAkC;AAC5D,SAASC,UAAU,EAAEC,QAAQ,QAAQ,eAAe;AAEpD,SAASC,WAAW,EAAEC,aAAa,EAAEC,kBAAkB,QAAQ,gBAAgB;AAI/E,OAAO,SAASC,iBAAiBC,OAAwB;IACvD,MAAMC,aAAaD,QAAQC,UAAU;IAErC,OAAO,OAAOC;QACZ,IAAI,CAACR,WAAWQ,KAAKC,IAAI,GAAG,OAAOF,WAAWG,IAAI,CAACJ,SAASE;QAE5D,MAAM,EAAEG,EAAE,EAAEC,KAAK,EAAEC,GAAG,EAAEC,SAAS,EAAEC,IAAI,EAAE,GAAGP;QAC5C,MAAM,EAAEQ,MAAM,EAAEC,KAAK,EAAE,GAAGf,YAAYI;QAEtC,MAAMY,QAAQ;YACZC,KAAK;gBACHX,KAAKU,KAAK,IAAI,CAAC;mBACXP,OAAOS,YAAY;oBAAC;wBAAET,IAAI;4BAAEU,QAAQV;wBAAG;oBAAE;iBAAE,GAAG,EAAE;gBACpDV,SAAS,IAAIqB,OAAOC,WAAW;aAChC;QACH;QAEA,MAAMC,QAAQ,MAAMP,MAAMQ,UAAU,CAAC;YAAEC,SAASpB,QAAQoB,OAAO;YAAER;QAAM;QAEvE,MAAMS,UAAU,MAAMxB,cAAc;YAAEG;YAASO;QAAI;QAEnD,MAAMe,aACJjB,OAAOS,YACH;YAAC;gBAAET;YAAG;SAAE,GACR,AACE,CAAA,MAAML,QAAQuB,IAAI,CAAC;YACjBC,YAAY;YACZZ;YACAH;YACAH,OAAO,OAAOA,UAAU,YAAYA,QAAQ,IAAIA,QAAQ;YACxDmB,YAAY;YACZC,QAAQ;gBAAErB,IAAI;YAAK;YACnBE;QACF,EAAC,EACDoB,IAAI;QAEZ,MAAMC,SAAS9B,mBAAmB;YAAEE;YAASG,MAAM;gBAAE,GAAGD,KAAKC,IAAI;YAAC;QAAE;QAEpE,MAAM0B,SAAqB,EAAE;QAE7B,KAAK,MAAMC,aAAaR,WAAY;YAClC,MAAMS,iBAAiB,MAAMpB,MAAMQ,UAAU,CAAC;gBAC5CC,SAASpB,QAAQoB,OAAO;gBACxBR,OAAO;oBAAEP,IAAI;wBAAEU,QAAQe,UAAUzB,EAAE;oBAAC;gBAAE;YACxC;YAEA,MAAM2B,MAAM,MAAMrB,MAAMsB,gBAAgB,CAAC;gBAAEC,MAAM;oBAAChB;oBAAOa;iBAAe;YAAC,GAAGH,QAAQ;gBAClFP;gBACAc,YAAY;gBACZC,KAAK;YACP,GAAGC,IAAI;YAEP,IAAI,CAACL,KAAK;YAEVvC,UAAU;gBAAEO;gBAASG,MAAM6B;gBAAKtB;gBAAQ4B,WAAW;YAAO;YAE1DT,OAAOU,IAAI,CAACP;QACd;QAEA,OAAOxB,cAAc,QAAQ,OAAOqB;IACtC;AACF","file":"updateJobs.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frogbotai/db-mongodb",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "FrogBot MongoDB adapter.",
   "license": "MIT",
   "author": "Colby Gilbert",
@@ -25,15 +25,15 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@payloadcms/db-mongodb": "3.90.1",
-    "payload": "3.90.1"
+    "@payloadcms/db-mongodb": "4.0.0-beta.2",
+    "payload": "4.0.0-beta.2"
   },
   "peerDependencies": {
-    "frogbot": "0.33.0"
+    "frogbot": "0.34.0"
   },
   "devDependencies": {
-    "typescript": "5.6.2",
-    "frogbot": "0.33.0"
+    "typescript": "6.0.3",
+    "frogbot": "0.34.0"
   },
   "publishConfig": {
     "access": "public"

package/dist/updateJobLeases.d.ts

@@ -1,6 +0,0 @@
-import type { MongooseAdapter } from '@payloadcms/db-mongodb';
-import type { JobLeaseMutation } from 'frogbot/jobs';
-export declare function updateJobLeases({ adapter, data, req, where, }: JobLeaseMutation & {
-    adapter: MongooseAdapter;
-}): Promise<void>;
-//# sourceMappingURL=updateJobLeases.d.ts.map

package/dist/updateJobLeases.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"updateJobLeases.d.ts","sourceRoot":"","sources":["../src/updateJobLeases.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAIrD,wBAAsB,eAAe,CAAC,EACpC,OAAO,EACP,IAAI,EACJ,GAAG,EACH,KAAK,GACN,EAAE,gBAAgB,GAAG;IAAE,OAAO,EAAE,eAAe,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAcjE"}

package/dist/updateJobLeases.js

@@ -1,27 +0,0 @@
-import { getJobModel, getJobSession, transformJobUpdate } from './jobModel.js';
-export async function updateJobLeases({ adapter, data, req, where }) {
-    if (req.payload !== adapter.payload) {
-        throw new Error('FrogBot job lease updates require a request for this runtime.');
-    }
-    const { Model } = getJobModel(adapter);
-    const query = await Model.buildQuery({
-        payload: adapter.payload,
-        where
-    });
-    const update = transformJobUpdate({
-        adapter,
-        data: {
-            ...data
-        }
-    });
-    const session = await getJobSession({
-        adapter,
-        req
-    });
-    await Model.updateMany(query, update, {
-        session,
-        timestamps: false
-    });
-}
-
-//# sourceMappingURL=updateJobLeases.js.map

package/dist/updateJobLeases.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/updateJobLeases.ts"],"names":["getJobModel","getJobSession","transformJobUpdate","updateJobLeases","adapter","data","req","where","payload","Error","Model","query","buildQuery","update","session","updateMany","timestamps"],"mappings":"AAGA,SAASA,WAAW,EAAEC,aAAa,EAAEC,kBAAkB,QAAQ,gBAAgB;AAE/E,OAAO,eAAeC,gBAAgB,EACpCC,OAAO,EACPC,IAAI,EACJC,GAAG,EACHC,KAAK,EAC2C;IAChD,IAAID,IAAIE,OAAO,KAAKJ,QAAQI,OAAO,EAAE;QACnC,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAM,EAAEC,KAAK,EAAE,GAAGV,YAAYI;IAE9B,MAAMO,QAAQ,MAAMD,MAAME,UAAU,CAAC;QAAEJ,SAASJ,QAAQI,OAAO;QAAED;IAAM;IAEvE,MAAMM,SAASX,mBAAmB;QAAEE;QAASC,MAAM;YAAE,GAAGA,IAAI;QAAC;IAAE;IAE/D,MAAMS,UAAU,MAAMb,cAAc;QAAEG;QAASE;IAAI;IAEnD,MAAMI,MAAMK,UAAU,CAACJ,OAAOE,QAAQ;QAAEC;QAASE,YAAY;IAAM;AACrE","file":"updateJobLeases.js"}