@convex-dev/workpool 0.2.17-alpha.0 → 0.2.17-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. package/dist/commonjs/component/crons.js +1 -1
  2. package/dist/commonjs/component/crons.js.map +1 -1
  3. package/dist/commonjs/component/danger.d.ts +5 -0
  4. package/dist/commonjs/component/danger.d.ts.map +1 -1
  5. package/dist/commonjs/component/danger.js +58 -1
  6. package/dist/commonjs/component/danger.js.map +1 -1
  7. package/dist/esm/component/crons.js +1 -1
  8. package/dist/esm/component/crons.js.map +1 -1
  9. package/dist/esm/component/danger.d.ts +5 -0
  10. package/dist/esm/component/danger.d.ts.map +1 -1
  11. package/dist/esm/component/danger.js +58 -1
  12. package/dist/esm/component/danger.js.map +1 -1
  13. package/package.json +1 -1
  14. package/src/component/crons.ts +1 -1
  15. package/src/component/danger.ts +64 -1
package/dist/commonjs/component/crons.js CHANGED
@@ -56,6 +56,6 @@ export const recover = internalMutation({
56
56
  }
57
57
  },
58
58
  });
59
- crons.interval("recover", { minutes: 5 }, internal.crons.recover);
59
+ crons.interval("recover", { minutes: 30 }, internal.crons.recover);
60
60
  export default crons;
61
61
  //# sourceMappingURL=crons.js.map
package/dist/commonjs/component/crons.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"crons.js","sourceRoot":"","sources":["../../../src/component/crons.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"crons.js","sourceRoot":"","sources":["../../../src/component/crons.ts"],"names":[],"mappings":"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"}
package/dist/commonjs/component/danger.d.ts CHANGED
@@ -3,4 +3,9 @@ export declare const clearPending: import("convex/server").RegisteredMutation<"i
3
3
  before?: number | undefined;
4
4
  cursor?: string | undefined;
5
5
  }, Promise<void>>;
6
+ export declare const clearOldWork: import("convex/server").RegisteredMutation<"internal", {
7
+ olderThan?: number | undefined;
8
+ before?: number | undefined;
9
+ cursor?: string | undefined;
10
+ }, Promise<void>>;
6
11
  //# sourceMappingURL=danger.d.ts.map
package/dist/commonjs/component/danger.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"danger.d.ts","sourceRoot":"","sources":["../../../src/component/danger.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,YAAY;;;;iBAgCvB,CAAC"}
1
+ {"version":3,"file":"danger.d.ts","sourceRoot":"","sources":["../../../src/component/danger.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,YAAY;;;;iBAgCvB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;iBA2DvB,CAAC"}
package/dist/commonjs/component/danger.js CHANGED
@@ -1,6 +1,8 @@
1
1
  import { v } from "convex/values";
2
2
  import { internal } from "./_generated/api.js";
3
3
  import { internalMutation, } from "./_generated/server.js";
4
+ import { paginator } from "convex-helpers/server/pagination";
5
+ import schema from "./schema.js";
4
6
  const DEFAULT_OLDER_THAN = 1000 * 60 * 60 * 24;
5
7
  export const clearPending = internalMutation({
6
8
  args: {
@@ -10,7 +12,7 @@ export const clearPending = internalMutation({
10
12
  },
11
13
  handler: async (ctx, args) => {
12
14
  const time = args.before ?? Date.now() - (args.olderThan ?? DEFAULT_OLDER_THAN);
13
- const entries = await ctx.db
15
+ const entries = await paginator(ctx.db, schema)
14
16
  .query("pendingStart")
15
17
  .withIndex("by_creation_time", (q) => q.lt("_creationTime", time))
16
18
  .paginate({
@@ -32,4 +34,59 @@ export const clearPending = internalMutation({
32
34
  }
33
35
  },
34
36
  });
37
+ export const clearOldWork = internalMutation({
38
+ args: {
39
+ olderThan: v.optional(v.number()),
40
+ before: v.optional(v.number()),
41
+ cursor: v.optional(v.string()),
42
+ },
43
+ handler: async (ctx, args) => {
44
+ const time = args.before ?? Date.now() - (args.olderThan ?? DEFAULT_OLDER_THAN);
45
+ const entries = await paginator(ctx.db, schema)
46
+ .query("work")
47
+ .withIndex("by_creation_time", (q) => q.lt("_creationTime", time))
48
+ .paginate({
49
+ cursor: args.cursor ?? null,
50
+ numItems: 100,
51
+ });
52
+ await Promise.all(entries.page.map(async (entry) => {
53
+ const pendingStart = await ctx.db
54
+ .query("pendingStart")
55
+ .withIndex("workId", (q) => q.eq("workId", entry._id))
56
+ .unique();
57
+ if (pendingStart) {
58
+ await ctx.db.delete(pendingStart._id);
59
+ }
60
+ const pendingCompletion = await ctx.db
61
+ .query("pendingCompletion")
62
+ .withIndex("workId", (q) => q.eq("workId", entry._id))
63
+ .unique();
64
+ if (pendingCompletion) {
65
+ await ctx.db.delete(pendingCompletion._id);
66
+ }
67
+ const pendingCancelation = await ctx.db
68
+ .query("pendingCancelation")
69
+ .withIndex("workId", (q) => q.eq("workId", entry._id))
70
+ .unique();
71
+ if (pendingCancelation) {
72
+ await ctx.db.delete(pendingCancelation._id);
73
+ }
74
+ console.debug(`cleared ${entry.fnName}: ${entry.fnArgs} (${Object.entries({
75
+ pendingStart,
76
+ pendingCompletion,
77
+ pendingCancelation,
78
+ })
79
+ .filter(([_, v]) => v !== null)
80
+ .map(([name]) => name)
81
+ .join(", ")})`);
82
+ await ctx.db.delete(entry._id);
83
+ }));
84
+ if (!entries.isDone) {
85
+ await ctx.scheduler.runAfter(0, internal.danger.clearOldWork, {
86
+ before: time,
87
+ cursor: entries.continueCursor,
88
+ });
89
+ }
90
+ },
91
+ });
35
92
  //# sourceMappingURL=danger.js.map
package/dist/commonjs/component/danger.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"danger.js","sourceRoot":"","sources":["../../../src/component/danger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,eAAe,CAAC;AAClC,OAAO,EAAO,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAGL,gBAAgB,GAIjB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAE/C,MAAM,CAAC,MAAM,YAAY,GAAG,gBAAgB,CAAC;IAC3C,IAAI,EAAE;QACJ,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACjC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QAC9B,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;KAC/B;IACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC3B,MAAM,IAAI,GACR,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,kBAAkB,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,EAAE;aACzB,KAAK,CAAC,cAAc,CAAC;aACrB,SAAS,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;aACjE,QAAQ,CAAC;YACR,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,IAAI;YAC3B,QAAQ,EAAE,GAAG;SACd,CAAC,CAAC;QACL,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAC/B,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5C,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE;gBAC5D,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,OAAO,CAAC,cAAc;aAC/B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"danger.js","sourceRoot":"","sources":["../../../src/component/danger.ts"],"names":[],"mappings":"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"}
package/dist/esm/component/crons.js CHANGED
@@ -56,6 +56,6 @@ export const recover = internalMutation({
56
56
  }
57
57
  },
58
58
  });
59
- crons.interval("recover", { minutes: 5 }, internal.crons.recover);
59
+ crons.interval("recover", { minutes: 30 }, internal.crons.recover);
60
60
  export default crons;
61
61
  //# sourceMappingURL=crons.js.map
package/dist/esm/component/crons.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"crons.js","sourceRoot":"","sources":["../../../src/component/crons.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"crons.js","sourceRoot":"","sources":["../../../src/component/crons.ts"],"names":[],"mappings":"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"}
package/dist/esm/component/danger.d.ts CHANGED
@@ -3,4 +3,9 @@ export declare const clearPending: import("convex/server").RegisteredMutation<"i
3
3
  before?: number | undefined;
4
4
  cursor?: string | undefined;
5
5
  }, Promise<void>>;
6
+ export declare const clearOldWork: import("convex/server").RegisteredMutation<"internal", {
7
+ olderThan?: number | undefined;
8
+ before?: number | undefined;
9
+ cursor?: string | undefined;
10
+ }, Promise<void>>;
6
11
  //# sourceMappingURL=danger.d.ts.map
package/dist/esm/component/danger.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"danger.d.ts","sourceRoot":"","sources":["../../../src/component/danger.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,YAAY;;;;iBAgCvB,CAAC"}
1
+ {"version":3,"file":"danger.d.ts","sourceRoot":"","sources":["../../../src/component/danger.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,YAAY;;;;iBAgCvB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;iBA2DvB,CAAC"}
package/dist/esm/component/danger.js CHANGED
@@ -1,6 +1,8 @@
1
1
  import { v } from "convex/values";
2
2
  import { internal } from "./_generated/api.js";
3
3
  import { internalMutation, } from "./_generated/server.js";
4
+ import { paginator } from "convex-helpers/server/pagination";
5
+ import schema from "./schema.js";
4
6
  const DEFAULT_OLDER_THAN = 1000 * 60 * 60 * 24;
5
7
  export const clearPending = internalMutation({
6
8
  args: {
@@ -10,7 +12,7 @@ export const clearPending = internalMutation({
10
12
  },
11
13
  handler: async (ctx, args) => {
12
14
  const time = args.before ?? Date.now() - (args.olderThan ?? DEFAULT_OLDER_THAN);
13
- const entries = await ctx.db
15
+ const entries = await paginator(ctx.db, schema)
14
16
  .query("pendingStart")
15
17
  .withIndex("by_creation_time", (q) => q.lt("_creationTime", time))
16
18
  .paginate({
@@ -32,4 +34,59 @@ export const clearPending = internalMutation({
32
34
  }
33
35
  },
34
36
  });
37
+ export const clearOldWork = internalMutation({
38
+ args: {
39
+ olderThan: v.optional(v.number()),
40
+ before: v.optional(v.number()),
41
+ cursor: v.optional(v.string()),
42
+ },
43
+ handler: async (ctx, args) => {
44
+ const time = args.before ?? Date.now() - (args.olderThan ?? DEFAULT_OLDER_THAN);
45
+ const entries = await paginator(ctx.db, schema)
46
+ .query("work")
47
+ .withIndex("by_creation_time", (q) => q.lt("_creationTime", time))
48
+ .paginate({
49
+ cursor: args.cursor ?? null,
50
+ numItems: 100,
51
+ });
52
+ await Promise.all(entries.page.map(async (entry) => {
53
+ const pendingStart = await ctx.db
54
+ .query("pendingStart")
55
+ .withIndex("workId", (q) => q.eq("workId", entry._id))
56
+ .unique();
57
+ if (pendingStart) {
58
+ await ctx.db.delete(pendingStart._id);
59
+ }
60
+ const pendingCompletion = await ctx.db
61
+ .query("pendingCompletion")
62
+ .withIndex("workId", (q) => q.eq("workId", entry._id))
63
+ .unique();
64
+ if (pendingCompletion) {
65
+ await ctx.db.delete(pendingCompletion._id);
66
+ }
67
+ const pendingCancelation = await ctx.db
68
+ .query("pendingCancelation")
69
+ .withIndex("workId", (q) => q.eq("workId", entry._id))
70
+ .unique();
71
+ if (pendingCancelation) {
72
+ await ctx.db.delete(pendingCancelation._id);
73
+ }
74
+ console.debug(`cleared ${entry.fnName}: ${entry.fnArgs} (${Object.entries({
75
+ pendingStart,
76
+ pendingCompletion,
77
+ pendingCancelation,
78
+ })
79
+ .filter(([_, v]) => v !== null)
80
+ .map(([name]) => name)
81
+ .join(", ")})`);
82
+ await ctx.db.delete(entry._id);
83
+ }));
84
+ if (!entries.isDone) {
85
+ await ctx.scheduler.runAfter(0, internal.danger.clearOldWork, {
86
+ before: time,
87
+ cursor: entries.continueCursor,
88
+ });
89
+ }
90
+ },
91
+ });
35
92
  //# sourceMappingURL=danger.js.map
package/dist/esm/component/danger.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"danger.js","sourceRoot":"","sources":["../../../src/component/danger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,eAAe,CAAC;AAClC,OAAO,EAAO,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAGL,gBAAgB,GAIjB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAE/C,MAAM,CAAC,MAAM,YAAY,GAAG,gBAAgB,CAAC;IAC3C,IAAI,EAAE;QACJ,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACjC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QAC9B,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;KAC/B;IACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC3B,MAAM,IAAI,GACR,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,kBAAkB,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,EAAE;aACzB,KAAK,CAAC,cAAc,CAAC;aACrB,SAAS,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;aACjE,QAAQ,CAAC;YACR,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,IAAI;YAC3B,QAAQ,EAAE,GAAG;SACd,CAAC,CAAC;QACL,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAC/B,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5C,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE;gBAC5D,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,OAAO,CAAC,cAAc;aAC/B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"danger.js","sourceRoot":"","sources":["../../../src/component/danger.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "email": "support@convex.dev",
8
8
  "url": "https://github.com/get-convex/workpool/issues"
9
9
  },
10
- "version": "0.2.17-alpha.0",
10
+ "version": "0.2.17-alpha.2",
11
11
  "license": "Apache-2.0",
12
12
  "keywords": [
13
13
  "convex",
package/src/component/crons.ts CHANGED
@@ -61,6 +61,6 @@ export const recover = internalMutation({
61
61
  },
62
62
  });
63
63
 
64
- crons.interval("recover", { minutes: 5 }, internal.crons.recover);
64
+ crons.interval("recover", { minutes: 30 }, internal.crons.recover);
65
65
 
66
66
  export default crons;
package/src/component/danger.ts CHANGED
@@ -9,6 +9,8 @@ import {
9
9
  mutation,
10
10
  query,
11
11
  } from "./_generated/server.js";
12
+ import { paginator } from "convex-helpers/server/pagination";
13
+ import schema from "./schema.js";
12
14
 
13
15
  const DEFAULT_OLDER_THAN = 1000 * 60 * 60 * 24;
14
16
 
@@ -21,7 +23,7 @@ export const clearPending = internalMutation({
21
23
  handler: async (ctx, args) => {
22
24
  const time =
23
25
  args.before ?? Date.now() - (args.olderThan ?? DEFAULT_OLDER_THAN);
24
- const entries = await ctx.db
26
+ const entries = await paginator(ctx.db, schema)
25
27
  .query("pendingStart")
26
28
  .withIndex("by_creation_time", (q) => q.lt("_creationTime", time))
27
29
  .paginate({
@@ -45,3 +47,64 @@ export const clearPending = internalMutation({
45
47
  }
46
48
  },
47
49
  });
50
+
51
+ export const clearOldWork = internalMutation({
52
+ args: {
53
+ olderThan: v.optional(v.number()),
54
+ before: v.optional(v.number()),
55
+ cursor: v.optional(v.string()),
56
+ },
57
+ handler: async (ctx, args) => {
58
+ const time =
59
+ args.before ?? Date.now() - (args.olderThan ?? DEFAULT_OLDER_THAN);
60
+ const entries = await paginator(ctx.db, schema)
61
+ .query("work")
62
+ .withIndex("by_creation_time", (q) => q.lt("_creationTime", time))
63
+ .paginate({
64
+ cursor: args.cursor ?? null,
65
+ numItems: 100,
66
+ });
67
+ await Promise.all(
68
+ entries.page.map(async (entry) => {
69
+ const pendingStart = await ctx.db
70
+ .query("pendingStart")
71
+ .withIndex("workId", (q) => q.eq("workId", entry._id))
72
+ .unique();
73
+ if (pendingStart) {
74
+ await ctx.db.delete(pendingStart._id);
75
+ }
76
+ const pendingCompletion = await ctx.db
77
+ .query("pendingCompletion")
78
+ .withIndex("workId", (q) => q.eq("workId", entry._id))
79
+ .unique();
80
+ if (pendingCompletion) {
81
+ await ctx.db.delete(pendingCompletion._id);
82
+ }
83
+ const pendingCancelation = await ctx.db
84
+ .query("pendingCancelation")
85
+ .withIndex("workId", (q) => q.eq("workId", entry._id))
86
+ .unique();
87
+ if (pendingCancelation) {
88
+ await ctx.db.delete(pendingCancelation._id);
89
+ }
90
+ console.debug(
91
+ `cleared ${entry.fnName}: ${entry.fnArgs} (${Object.entries({
92
+ pendingStart,
93
+ pendingCompletion,
94
+ pendingCancelation,
95
+ })
96
+ .filter(([_, v]) => v !== null)
97
+ .map(([name]) => name)
98
+ .join(", ")})`
99
+ );
100
+ await ctx.db.delete(entry._id);
101
+ })
102
+ );
103
+ if (!entries.isDone) {
104
+ await ctx.scheduler.runAfter(0, internal.danger.clearOldWork, {
105
+ before: time,
106
+ cursor: entries.continueCursor,
107
+ });
108
+ }
109
+ },
110
+ });