ts-sidekiq 0.4.2 → 0.5.0
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.
- package/build/redis-client.d.ts +3 -2
- package/build/redis-client.js +39 -1
- package/build/redis-client.js.map +1 -1
- package/package.json +1 -1
- package/types/sidekiq.d.ts +8 -0
package/build/redis-client.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { SidekiqJob, SidekiqRetryJob } from "../types/sidekiq";
|
|
1
|
+
import type { SidekiqJob, SidekiqRetryJob, SidekiqWorkingJob } from "../types/sidekiq";
|
|
2
2
|
declare const getSidekiqData: (redisUrl?: string) => Promise<{
|
|
3
3
|
keys: string[];
|
|
4
4
|
queues: {
|
|
@@ -57,6 +57,7 @@ declare const getSidekiqData: (redisUrl?: string) => Promise<{
|
|
|
57
57
|
} | undefined>;
|
|
58
58
|
declare const getSidekiqQueueJobs: (queueName: string, redisUrl?: string) => Promise<SidekiqJob[]>;
|
|
59
59
|
declare const getSidekiqRetryJobs: (redisUrl?: string) => Promise<SidekiqRetryJob[]>;
|
|
60
|
+
declare const getSidekiqWorkingJobs: (redisUrl?: string) => Promise<SidekiqWorkingJob[]>;
|
|
60
61
|
declare const removeSidekiqQueueJob: (queueName: string, jids: string[], redisUrl?: string) => Promise<void>;
|
|
61
62
|
declare const removeSidekiqRetryJob: (jids: string[], redisUrl?: string) => Promise<void>;
|
|
62
|
-
export { getSidekiqData, getSidekiqQueueJobs, getSidekiqRetryJobs, removeSidekiqQueueJob, removeSidekiqRetryJob, };
|
|
63
|
+
export { getSidekiqData, getSidekiqQueueJobs, getSidekiqRetryJobs, getSidekiqWorkingJobs, removeSidekiqQueueJob, removeSidekiqRetryJob, };
|
package/build/redis-client.js
CHANGED
|
@@ -117,6 +117,44 @@ const getSidekiqRetryJobs = (redisUrl) => __awaiter(void 0, void 0, void 0, func
|
|
|
117
117
|
return [];
|
|
118
118
|
}
|
|
119
119
|
});
|
|
120
|
+
const getSidekiqWorkingJobs = (redisUrl) => __awaiter(void 0, void 0, void 0, function* () {
|
|
121
|
+
try {
|
|
122
|
+
const client = yield redisClient(redisUrl);
|
|
123
|
+
const processSet = yield client.sMembers("processes");
|
|
124
|
+
const workingJobs = yield Promise.all(processSet.map((processKey) => __awaiter(void 0, void 0, void 0, function* () {
|
|
125
|
+
const work = yield client.hGetAll(`${processKey}:work`);
|
|
126
|
+
const processWorkingJobs = [];
|
|
127
|
+
Object.entries(work).forEach(([threadId, jobString]) => {
|
|
128
|
+
var _a, _b;
|
|
129
|
+
try {
|
|
130
|
+
const jobDetails = JSON.parse(jobString);
|
|
131
|
+
const payload = jobDetails.payload;
|
|
132
|
+
if (!payload) {
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
processWorkingJobs.push({
|
|
136
|
+
processKey,
|
|
137
|
+
threadId,
|
|
138
|
+
queue: (_b = (_a = jobDetails.queue) !== null && _a !== void 0 ? _a : payload.queue) !== null && _b !== void 0 ? _b : "",
|
|
139
|
+
run_at: typeof jobDetails.run_at === "number"
|
|
140
|
+
? jobDetails.run_at
|
|
141
|
+
: null,
|
|
142
|
+
payload,
|
|
143
|
+
});
|
|
144
|
+
}
|
|
145
|
+
catch (err) {
|
|
146
|
+
console.error(`JSON parsing error for working job: ${jobString}`, err);
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
return processWorkingJobs;
|
|
150
|
+
})));
|
|
151
|
+
return workingJobs.flat();
|
|
152
|
+
}
|
|
153
|
+
catch (err) {
|
|
154
|
+
console.error("Failed to get working jobs:", err);
|
|
155
|
+
return [];
|
|
156
|
+
}
|
|
157
|
+
});
|
|
120
158
|
const removeSidekiqQueueJob = (queueName, jids, redisUrl) => __awaiter(void 0, void 0, void 0, function* () {
|
|
121
159
|
try {
|
|
122
160
|
const client = yield redisClient(redisUrl);
|
|
@@ -153,5 +191,5 @@ const removeSidekiqRetryJob = (jids, redisUrl) => __awaiter(void 0, void 0, void
|
|
|
153
191
|
throw err;
|
|
154
192
|
}
|
|
155
193
|
});
|
|
156
|
-
export { getSidekiqData, getSidekiqQueueJobs, getSidekiqRetryJobs, removeSidekiqQueueJob, removeSidekiqRetryJob, };
|
|
194
|
+
export { getSidekiqData, getSidekiqQueueJobs, getSidekiqRetryJobs, getSidekiqWorkingJobs, removeSidekiqQueueJob, removeSidekiqRetryJob, };
|
|
157
195
|
//# sourceMappingURL=redis-client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-client.js","sourceRoot":"","sources":["../src/redis-client.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"redis-client.js","sourceRoot":"","sources":["../src/redis-client.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/types/sidekiq.d.ts
CHANGED
|
@@ -46,6 +46,14 @@ export type SidekiqJob = {
|
|
|
46
46
|
enqueued_at: number; // Unixタイムスタンプ
|
|
47
47
|
};
|
|
48
48
|
|
|
49
|
+
export type SidekiqWorkingJob = {
|
|
50
|
+
processKey: string;
|
|
51
|
+
threadId: string;
|
|
52
|
+
queue: string;
|
|
53
|
+
run_at: number | null;
|
|
54
|
+
payload: SidekiqJob;
|
|
55
|
+
};
|
|
56
|
+
|
|
49
57
|
export type SidekiqRetryJob = {
|
|
50
58
|
retry: boolean;
|
|
51
59
|
queue: string;
|