sidekiq-ts 1.0.0 → 1.0.3

package/README.md

@@ -272,7 +272,7 @@ process.on("SIGTERM", async () => {
 ### CLI
 
 ```bash
-sidekiq-ts [options]
+npx sidekiq [options]
 ```
 
 **Options:**
@@ -294,13 +294,13 @@ sidekiq-ts [options]
 
 ```bash
 # Basic usage
-sidekiq-ts -r ./dist/jobs.js
+npx sidekiq -r ./dist/jobs.js
 
 # Multiple queues with weights
-sidekiq-ts -q critical,5 -q default,2 -q background -c 10
+npx sidekiq -q critical,5 -q default,2 -q background -c 10
 
 # With config file
-sidekiq-ts -C config/sidekiq.json -e production
+npx sidekiq -C config/sidekiq.json -e production
 ```
 
 ## Configuration File
@@ -640,7 +640,7 @@ After=network.target redis.service
 Type=simple
 User=app
 WorkingDirectory=/app
-ExecStart=/usr/bin/node /app/node_modules/.bin/sidekiq-ts -C /app/sidekiq.json
+ExecStart=/usr/bin/npx sidekiq -C /app/sidekiq.json
 Restart=always
 RestartSec=5
 
@@ -655,14 +655,32 @@ WantedBy=multi-user.target
 module.exports = {
   apps: [{
     name: "sidekiq-worker",
-    script: "node_modules/.bin/sidekiq-ts",
-    args: "-C sidekiq.json",
+    script: "npx",
+    args: "sidekiq -C sidekiq.json",
     instances: 2,
     exec_mode: "cluster",
   }]
 };
 ```
 
+**Docker example:**
+
+```dockerfile
+FROM node:24-alpine
+WORKDIR /app
+COPY package*.json ./
+RUN npm ci --omit=dev
+COPY dist ./dist
+COPY sidekiq.json ./
+CMD ["npx", "sidekiq", "-C", "sidekiq.json"]
+```
+
+```bash
+# Build and run
+docker build -t my-worker .
+docker run -e REDIS_URL=redis://host:6379 my-worker
+```
+
 ### Redis Configuration
 
 For production Redis:

package/dist/cli-helpers.d.ts

@@ -1,4 +1,5 @@
 import type { Config } from "./config.js";
+import type { Logger } from "./logger.js";
 export declare const DEFAULT_CONFIG_PATH = "sidekiq.json";
 export interface CliOptions {
     configPath: string;
@@ -19,4 +20,14 @@ export declare const applyCliOptions: (config: Config, options: CliOptions, load
     config: Config;
     requirePaths: string[];
 };
+export interface ShutdownDeps {
+    logger: Logger;
+    stop: () => Promise<void>;
+    exit: (code: number) => void;
+}
+export interface ShutdownHandler {
+    (signal: string): Promise<void>;
+    isShuttingDown: () => boolean;
+}
+export declare const createShutdownHandler: (deps: ShutdownDeps) => ShutdownHandler;
 //# sourceMappingURL=cli-helpers.d.ts.map

package/dist/cli-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-helpers.d.ts","sourceRoot":"","sources":["../src/cli-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG1C,eAAO,MAAM,mBAAmB,iBAAiB,CAAC;AAElD,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB;AAWD,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,KAAG,UAiH1C,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG,MAAM,GAAG,SAKvC,CAAC;AASxB,eAAO,MAAM,eAAe,GAC1B,QAAQ,MAAM,EACd,SAAS,UAAU,EACnB,qBAAoB,MAAM,EAAO,KAChC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,EAAE,CAAA;CAuB1C,CAAC"}
+{"version":3,"file":"cli-helpers.d.ts","sourceRoot":"","sources":["../src/cli-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,eAAO,MAAM,mBAAmB,iBAAiB,CAAC;AAElD,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB;AAWD,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,KAAG,UAiH1C,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG,MAAM,GAAG,SAKvC,CAAC;AASxB,eAAO,MAAM,eAAe,GAC1B,QAAQ,MAAM,EACd,SAAS,UAAU,EACnB,qBAAoB,MAAM,EAAO,KAChC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,EAAE,CAAA;CAuB1C,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,cAAc,EAAE,MAAM,OAAO,CAAC;CAC/B;AAED,eAAO,MAAM,qBAAqB,GAAI,MAAM,YAAY,KAAG,eAkB1D,CAAC"}

package/dist/cli-helpers.js

@@ -150,3 +150,19 @@ export const applyCliOptions = (config, options, loadedRequirePaths = []) => {
     }
     return { config, requirePaths };
 };
+export const createShutdownHandler = (deps) => {
+    let shuttingDown = false;
+    const handler = async (signal) => {
+        if (shuttingDown) {
+            deps.logger.info(() => `Received ${signal}, forcing exit`);
+            deps.exit(1);
+            return;
+        }
+        shuttingDown = true;
+        deps.logger.info(() => `Received ${signal}, shutting down`);
+        await deps.stop();
+        deps.exit(0);
+    };
+    handler.isShuttingDown = () => shuttingDown;
+    return handler;
+};

package/dist/cli.js

@@ -3,7 +3,7 @@ import { access } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { resolve } from "node:path";
 import { pathToFileURL } from "node:url";
-import { applyCliOptions, parseArgs, resolveEnvironment, } from "./cli-helpers.js";
+import { applyCliOptions, createShutdownHandler, parseArgs, resolveEnvironment, } from "./cli-helpers.js";
 import { Config } from "./config.js";
 import { loadConfigFile } from "./config-loader.js";
 import { Sidekiq } from "./sidekiq.js";
@@ -80,17 +80,12 @@ const main = async () => {
         await import(pathToFileURL(fullPath).href);
     }
     const runner = await Sidekiq.run({ config });
-    let shuttingDown = false;
     let quieting = false;
-    const shutdown = async (signal) => {
-        if (shuttingDown) {
-            return;
-        }
-        shuttingDown = true;
-        config.logger.info(() => `Received ${signal}, shutting down`);
-        await runner.stop();
-        process.exit(0);
-    };
+    const shutdown = createShutdownHandler({
+        logger: config.logger,
+        stop: () => runner.stop(),
+        exit: (code) => process.exit(code),
+    });
     const quiet = async (signal) => {
         if (quieting) {
             return;

package/dist/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAU1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAqG7C,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,SAAS,CAAC,CAAgD;IAClE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAEnB;IACT,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAGtB;IACJ,OAAO,CAAC,QAAQ,CAAC,UAAU,CAGvB;IACJ,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsB;IAChD,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,kBAAkB,CAAC,CAAoB;gBAEnC,MAAM,EAAE,MAAM;IAQpB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B3B;;OAEG;IACH,MAAM,IAAI,OAAO;IAIjB;;OAEG;IACH,IAAI,iBAAiB,IAAI,iBAAiB,GAAG,SAAS,CAErD;IAED,YAAY,IAAI,YAAY,EAAE;IAsB9B,OAAO,CAAC,cAAc;YAKR,gBAAgB;YAWhB,WAAW;YAoBX,YAAY;IAM1B,OAAO,CAAC,kBAAkB;YAIZ,kBAAkB;IAqBhC,OAAO,CAAC,aAAa;YAQP,SAAS;YA0DT,YAAY;IAoB1B,OAAO,CAAC,aAAa;YAkBP,cAAc;IAa5B,OAAO,CAAC,WAAW;YAcL,QAAQ;IAWtB,OAAO,CAAC,SAAS;YAoBH,YAAY;YAMZ,cAAc;YAQd,iBAAiB;YAkBjB,eAAe;YAWf,eAAe;YAWf,gBAAgB;IA8B9B,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,aAAa;YAOP,gBAAgB;YA6BhB,QAAQ;YAiCR,SAAS;YA4BT,UAAU;YAwEV,aAAa;IA2H3B,OAAO,CAAC,WAAW;YAoBL,gBAAgB;YA8BhB,YAAY;YAYZ,gBAAgB;YAmBhB,gBAAgB;IAsB9B,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,gBAAgB;YAQV,UAAU;CAczB"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAU1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAsG7C,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,SAAS,CAAC,CAAgD;IAClE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAEnB;IACT,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAGtB;IACJ,OAAO,CAAC,QAAQ,CAAC,UAAU,CAGvB;IACJ,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsB;IAChD,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,kBAAkB,CAAC,CAAoB;gBAEnC,MAAM,EAAE,MAAM;IAQpB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoD3B;;OAEG;IACH,MAAM,IAAI,OAAO;IAIjB;;OAEG;IACH,IAAI,iBAAiB,IAAI,iBAAiB,GAAG,SAAS,CAErD;IAED,YAAY,IAAI,YAAY,EAAE;IAsB9B,OAAO,CAAC,cAAc;YAKR,gBAAgB;YAWhB,WAAW;YAoBX,YAAY;IAM1B,OAAO,CAAC,kBAAkB;YAIZ,kBAAkB;IAqBhC,OAAO,CAAC,aAAa;YAQP,SAAS;YA0DT,YAAY;IAoB1B,OAAO,CAAC,aAAa;YAkBP,cAAc;IAa5B,OAAO,CAAC,WAAW;YAcL,QAAQ;IAWtB,OAAO,CAAC,SAAS;YAoBH,YAAY;YAMZ,cAAc;YAQd,iBAAiB;YAkBjB,eAAe;YAWf,eAAe;YAWf,gBAAgB;IA8B9B,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,aAAa;YAOP,gBAAgB;YA6BhB,QAAQ;YAwCR,SAAS;YA4BT,UAAU;YAwEV,aAAa;IA2H3B,OAAO,CAAC,WAAW;YAoBL,gBAAgB;YA8BhB,YAAY;YAYZ,gBAAgB;YAmBhB,gBAAgB;IAsB9B,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,gBAAgB;YAQV,UAAU;CAczB"}

package/dist/runner.js

@@ -10,6 +10,7 @@ import { resolveJob } from "./registry.js";
 const FETCH_TIMEOUT_SECONDS = 2;
 const STATS_TTL_SECONDS = 5 * 365 * 24 * 60 * 60;
 const INITIAL_WAIT_SECONDS = 10;
+const PAUSE_TIME_MS = 500;
 const LUA_ZPOPBYSCORE = `
 local key, now = KEYS[1], ARGV[1]
 local jobs = redis.call("zrange", key, "-inf", now, "byscore", "limit", 0, 1)
@@ -158,7 +159,22 @@ export class Runner {
         await this.leaderElector?.stop();
         this.stopHeartbeat();
         this.stopScheduler();
+        // Brief pause to allow idle processors to finish
+        await sleep(PAUSE_TIME_MS);
         const deadline = Date.now() + this.config.timeout * 1000;
+        // Early exit if no jobs are running
+        if (this.inProgress.size === 0) {
+            await this.waitForWorkers(deadline);
+            await this.clearHeartbeat();
+            await Promise.all(this.workerRedis.map(async (client) => {
+                if (client.isOpen) {
+                    await client.quit();
+                }
+            }));
+            await this.config.fireEvent("exit", { reverse: true });
+            return;
+        }
+        this.config.logger.info(() => "Pausing to allow jobs to finish...");
         await this.waitForDrain(deadline);
         if (this.inProgress.size > 0) {
             await this.requeueInProgress();
@@ -511,7 +527,11 @@ export class Runner {
         }
     }
     async workLoop(index) {
-        while (!this.stopping) {
+        while (true) {
+            // Check stopping BEFORE fetching - don't start new work
+            if (this.stopping) {
+                break;
+            }
             if (this.quieting) {
                 await sleep(50);
                 continue;
@@ -520,6 +540,8 @@ export class Runner {
             if (!unit) {
                 continue;
             }
+            // Process the job - even if stopping became true during fetchWork
+            // Once we've popped a job from Redis, we MUST process it
             const workerId = `worker-${index}`;
             this.inProgress.set(workerId, {
                 queue: unit.queue,

package/package.json

@@ -1,9 +1,16 @@
 {
   "name": "sidekiq-ts",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "TypeScript client for Sidekiq job processing",
   "license": "MIT",
-  "keywords": ["sidekiq", "redis", "job", "queue", "worker", "typescript"],
+  "keywords": [
+    "sidekiq",
+    "redis",
+    "job",
+    "queue",
+    "worker",
+    "typescript"
+  ],
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,7 +23,9 @@
   "bin": {
     "sidekiq": "dist/cli.js"
   },
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "engines": {
     "node": ">=24.12.0"
   },
@@ -37,6 +46,6 @@
     "tsx": "^4.19.2",
     "typescript": "^5.7.2",
     "ultracite": "^6.5.0",
-    "vitest": "^2.1.8"
+    "vitest": "^4.0.16"
   }
 }