@open-wa/integration-s3 5.0.0-alpha.8 → 5.1.0

package/LICENSE.md

@@ -55,9 +55,9 @@ Licensor hereby grants permission by this license ("License"), free of charge,
 4. Compliance with Human Rights Laws and Human Rights Principles:
 
    a. **Human Rights Laws**. The Software shall not be used by any person or entity for any systems, activities, or other uses that violate any applicable laws, regulations, or rules that protect human, civil, labor, privacy, political, environmental, security, economic,  due process, or similar rights (the "Human Rights Laws"). Where the Human Rights Laws of more than one jurisdiction are applicable to the use of the Software, the Human Rights Laws that are most protective of the individuals or groups harmed shall apply.
- 
+
    b. **Human Rights Principles**. Licensee is advised to consult the articles of the United Nations Universal Declaration of Human Rights (https://www.un.org/en/universal-declaration-human-rights/) and the United Nations Global Compact (https://www.unglobalcompact.org/ what-is-gc/mission/principles) that define recognized principles of international human rights (the "Human Rights Principles"). It is Licensor's express intent that all use of the Software be consistent with Human Rights Principles. If Licensor receives notification  or otherwise learns of an alleged violation of any Human Rights Principles relating to Licensee's use of the Software, Licensor may in its discretion and without obligation (i) (a) notify Licensee of such allegation and (b) allow Licensee 90 days from notification  under (i)(a) to investigate and respond to Licensor regarding the allegation and (ii) (a) after the earlier of 90 days from notification under (i)(a), or Licensee's response under (i)(b), notify Licensee of License termination and (b) allow Licensee an additional 90  days from notification under (ii)(a) to cease use of the Software.
- 
+
    c. **Indemnity**. Licensee shall hold harmless and indemnify Licensor against all losses, damages, liabilities, deficiencies, claims, actions, judgments, settlements, interest, awards, penalties, fines, costs, or expenses of whatever kind, including Licensor's  reasonable attorneys' fees, arising out of or relating to Licensee's non-compliance with this License or use of the Software in violation of Human Rights Laws or Human Rights Principles. 
 
 5. Enforceability: If any portion or provision of this License is determined to be invalid, illegal, or unenforceable by a court of competent jurisdiction, then such invalidity, illegality, or unenforceability shall not affect any other term or provision of this License or invalidate or render unenforceable such term or provision in any other jurisdiction. Upon a determination that any term or provision is invalid, illegal, or unenforceable, to the extent permitted by applicable law, the court may modify this License to affect the original intent of the parties as closely as possible. The section headings are for convenience only and are not intended to affect the construction or interpretation of this License. Any rule of construction to the effect that ambiguities are to be resolved against the drafting party shall not apply in interpreting this License. The language in this License shall be interpreted as to its fair meaning and not strictly for or against any party.

package/README.md

@@ -6,15 +6,15 @@ Part of the [@open-wa v5 monorepo](https://github.com/open-wa/wa-automate-nodejs
 
 ## What it does
 
-`@open-wa/integration-s3` handles WhatsApp `message.received` events that contain decryptable media, uploads the media to an S3-compatible cloud storage provider through `pico-s3`, and attaches the resulting `cloudUrl` to the message object.
+`@open-wa/integration-s3` handles `message.received` events that contain decryptable media. It uploads media through `pico-s3` to S3-compatible storage. It adds the resulting `cloudUrl` to the message object.
 
-Use this integration when downstream message handlers should receive a cloud URL for media instead of only the original WhatsApp media reference.
+Use this integration so downstream message handlers receive a cloud URL instead of only the original WhatsApp media reference.
 
 ## Configuration
 
 The configuration type is `S3Config` in `src/config.ts`.
 
-| Field | Required | Source-visible behavior |
+| Field | Necessary | Source-visible behavior |
 | --- | --- | --- |
 | `provider` | Yes | Cloud provider identifier. Source type allows `aws`, `gcp`, `do`, `wasabi`, or `backblaze`. |
 | `accessKeyId` | Yes | Passed to `pico-s3` upload and URL generation options. |
@@ -36,7 +36,7 @@ The configuration type is `S3Config` in `src/config.ts`.
 - File extensions are derived from the MIME type with the `mime` package, falling back to `bin`.
 - File names use `message.mId` when present, otherwise `Date.now()`.
 - Duplicate file names are tracked in memory and return the existing cloud URL instead of uploading again.
-- Uploads run through a `PQueue` with concurrency 2, interval 1000 ms, and interval cap 2.
+- Uploads run through a bounded Effect queue with concurrency 2 and a two-per-second rate limit.
 - After a successful queue upload, `getCloudUrl` is used to compute the URL and the plugin assigns it to `message.cloudUrl`.
 - On `dispose`, the plugin waits for the upload queue to become idle and logs that the queue drained.
 
@@ -59,4 +59,4 @@ See the [docs site](https://openwa.dev).
 
 ## License
 
-[H-DNH V1.0](https://github.com/open-wa/wa-automate-nodejs/blob/main/LICENSE.md) - Hippocratic + Do Not Harm
+[H-DNH 1.1](https://github.com/open-wa/wa-automate-nodejs/blob/master/LICENSE.md) - Hippocratic + Do Not Harm

package/dist/index.cjs

@@ -16,16 +16,16 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
 //#endregion
-let p_queue = require("p-queue");
-p_queue = __toESM(p_queue);
+let effect = require("effect");
 let pico_s3 = require("pico-s3");
 let mime = require("mime");
-mime = __toESM(mime);
+mime = __toESM(mime, 1);
+let _open_wa_runtime_core = require("@open-wa/runtime-core");
 //#region src/config.ts
 let DirectoryStrategy = /* @__PURE__ */ function(DirectoryStrategy) {
 	DirectoryStrategy["DATE"] = "DATE";
@@ -41,10 +41,15 @@ var S3Uploader = class {
 		this.processedFiles = /* @__PURE__ */ new Set();
 		this.config = config;
 		this.logger = logger;
-		this.uploadQueue = new p_queue.default({
+		this.uploadQueue = _open_wa_runtime_core.ScopedTaskQueue.make({
+			name: "s3.upload",
 			concurrency: 2,
-			interval: 1e3,
-			intervalCap: 2
+			capacity: 64,
+			overload: "backpressure",
+			rate: {
+				intervalMs: 1e3,
+				limit: 2
+			}
 		});
 	}
 	async uploadMedia(message, client) {
@@ -56,8 +61,8 @@ var S3Uploader = class {
 		try {
 			const mediaData = await client.decryptMedia(message);
 			const opts = this.buildUploadOptions(filename, mediaData, message.from);
+			await (await this.uploadQueue).submit(() => (0, pico_s3.upload)(opts), filename);
 			this.processedFiles.add(filename);
-			await this.uploadQueue.add(() => (0, pico_s3.upload)(opts).catch(() => void 0));
 			return this.getCloudUrlForFile(filename);
 		} catch (error) {
 			this.logger.error(`Upload error: ${error.message}`);
@@ -65,7 +70,7 @@ var S3Uploader = class {
 		}
 	}
 	getCloudUrlForFile(filename) {
-		return (0, pico_s3.getCloudUrl)({
+		const opts = {
 			file: "",
 			filename,
 			provider: this.config.provider,
@@ -74,7 +79,8 @@ var S3Uploader = class {
 			bucket: this.config.bucket,
 			region: this.config.region,
 			public: this.config.public
-		});
+		};
+		return (0, pico_s3.getCloudUrl)(opts);
 	}
 	buildUploadOptions(filename, mediaData, from) {
 		const opts = {
@@ -98,44 +104,66 @@ var S3Uploader = class {
 		const cleanFrom = from.replace("@c.us", "").replace("@g.us", "");
 		const dateStr = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
 		switch (dirStrat) {
-			case DirectoryStrategy.DATE: return dateStr;
-			case DirectoryStrategy.CHAT: return cleanFrom;
-			case DirectoryStrategy.DATE_CHAT: return `${dateStr}/${cleanFrom}`;
-			case DirectoryStrategy.CHAT_DATE: return `${cleanFrom}/${dateStr}`;
+			case "DATE": return dateStr;
+			case "CHAT": return cleanFrom;
+			case "DATE_CHAT": return `${dateStr}/${cleanFrom}`;
+			case "CHAT_DATE": return `${cleanFrom}/${dateStr}`;
 			default: return typeof dirStrat === "string" ? dirStrat : void 0;
 		}
 	}
 	async waitForQueue() {
-		await this.uploadQueue.onIdle();
+		await (await this.uploadQueue).waitForIdle();
+	}
+	async close() {
+		await (await this.uploadQueue).close();
 	}
 };
 //#endregion
+//#region src/service.ts
+const S3UploaderService = effect.Context.Service("@open-wa/integration-s3/S3Uploader");
+const s3UploaderTestLayer = (uploader) => effect.Layer.succeed(S3UploaderService, uploader);
+const s3UploaderLayer = (config, logger) => effect.Layer.effect(S3UploaderService, effect.Effect.acquireRelease(effect.Effect.sync(() => new S3Uploader(config, logger)), (uploader) => effect.Effect.promise(async () => {
+	await uploader.waitForQueue();
+	await uploader.close();
+})));
+//#endregion
 //#region src/plugin.ts
 function s3Plugin(config) {
-	return async (input) => {
+	return Object.assign(async (input) => {
 		const { logger, client } = input;
-		const uploader = new S3Uploader(config, logger);
+		const runtime = effect.ManagedRuntime.make(s3UploaderLayer(config, logger));
+		const uploader = await runtime.runPromise(S3UploaderService);
 		const getWAClient = () => {
 			if (client && typeof client === "object" && "decryptMedia" in client) return client;
 			return null;
 		};
 		return {
-			"message.received": async ({ message }) => {
-				const msg = message;
-				const waClient = getWAClient();
-				if (msg.deprecatedMms3Url && msg.mimetype && waClient) {
-					const cloudUrl = await uploader.uploadMedia(msg, waClient);
-					if (cloudUrl) msg.cloudUrl = cloudUrl;
-				}
-			},
+			"message.received": ({ message }) => runtime.runPromise(effect.Effect.tryPromise({
+				try: async () => {
+					const msg = message;
+					const waClient = getWAClient();
+					if (msg.deprecatedMms3Url && msg.mimetype && waClient) {
+						const cloudUrl = await uploader.uploadMedia(msg, waClient);
+						if (cloudUrl) msg.cloudUrl = cloudUrl;
+					}
+				},
+				catch: (cause) => cause
+			})),
 			dispose: async () => {
-				await uploader.waitForQueue();
+				await runtime.dispose();
 				logger.info("S3 uploader queue drained");
 			}
 		};
-	};
+	}, { meta: {
+		name: "s3",
+		version: "5.0.0-alpha.7",
+		description: "Upload WhatsApp media to S3-compatible object storage"
+	} });
 }
 //#endregion
 exports.DirectoryStrategy = DirectoryStrategy;
 exports.S3Uploader = S3Uploader;
+exports.S3UploaderService = S3UploaderService;
 exports.s3Plugin = s3Plugin;
+exports.s3UploaderLayer = s3UploaderLayer;
+exports.s3UploaderTestLayer = s3UploaderTestLayer;

package/dist/index.d.cts

@@ -1,9 +1,9 @@
 import { Plugin } from "@open-wa/core";
 import { Logger } from "@open-wa/logger";
-
+import { Context, Layer } from "effect";
 //#region src/config.d.ts
 type CloudProvider = 'aws' | 'gcp' | 'do' | 'wasabi' | 'backblaze';
-declare enum DirectoryStrategy {
+export declare enum DirectoryStrategy {
   DATE = "DATE",
   CHAT = "CHAT",
   DATE_CHAT = "DATE_CHAT",
@@ -22,7 +22,7 @@ interface S3Config {
 }
 //#endregion
 //#region src/plugin.d.ts
-declare function s3Plugin(config: S3Config): Plugin;
+export declare function s3Plugin(config: S3Config): Plugin;
 //#endregion
 //#region src/uploader.d.ts
 interface MediaMessage {
@@ -35,18 +35,24 @@ interface MediaMessage {
 interface WAClient {
   decryptMedia: (message: unknown) => Promise<string>;
 }
-declare class S3Uploader {
+export declare class S3Uploader {
   private readonly config;
   private readonly logger;
   private readonly uploadQueue;
   private readonly processedFiles;
-  constructor(config: S3Config, logger: Logger);
+  constructor(config: S3Config, logger: Pick<Logger, 'error'>);
   uploadMedia(message: MediaMessage, client: WAClient): Promise<string | null>;
   getCloudUrlForFile(filename: string): string;
   private buildUploadOptions;
   private resolveDirectory;
   waitForQueue(): Promise<void>;
+  close(): Promise<void>;
 }
 //#endregion
-export { type CloudProvider, DirectoryStrategy, type S3Config, S3Uploader, s3Plugin };
+//#region src/service.d.ts
+export declare const S3UploaderService: Context.Service<S3Uploader, S3Uploader>;
+export declare const s3UploaderTestLayer: (uploader: S3Uploader) => Layer.Layer<S3Uploader, never, never>;
+export declare const s3UploaderLayer: (config: S3Config, logger: Pick<Logger, 'error'>) => Layer.Layer<S3Uploader, never, never>;
+//#endregion
+export type { CloudProvider, S3Config };
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","names":[],"sources":["../src/config.ts","../src/plugin.ts","../src/uploader.ts"],"mappings":";;;;KAAY,aAAA;AAAA,aAEA,iBAAA;EACV,IAAA;EACA,IAAA;EACA,SAAA;EACA,SAAA;AAAA;AAAA,UAGe,QAAA;EACf,QAAA,EAAU,aAAA;EACV,WAAA;EACA,eAAA;EACA,MAAA;EACA,MAAA;EACA,MAAA;EACA,SAAA,GAAY,iBAAA;EACZ,iBAAA;EACA,OAAA,GAAU,MAAA;AAAA;;;iBCJI,QAAA,CAAS,MAAA,EAAQ,QAAA,GAAW,MAAA;;;UCRlC,YAAA;EACR,GAAA;EACA,QAAA;EACA,IAAA;EACA,MAAA;EACA,iBAAA;AAAA;AAAA,UAGQ,QAAA;EACR,YAAA,GAAe,OAAA,cAAqB,OAAA;AAAA;AAAA,cAgBzB,UAAA;EAAA,iBACM,MAAA;EAAA,iBACA,MAAA;EAAA,iBACA,WAAA;EAAA,iBACA,cAAA;cAEL,MAAA,EAAQ,QAAA,EAAU,MAAA,EAAQ,MAAA;EAUhC,WAAA,CAAY,OAAA,EAAS,YAAA,EAAc,MAAA,EAAQ,QAAA,GAAW,OAAA;EA8B5D,kBAAA,CAAmB,QAAA;EAAA,QAcX,kBAAA;EAAA,QAqBA,gBAAA;EAqBF,YAAA,CAAA,GAAgB,OAAA;AAAA"}
+{"version":3,"file":"index.d.cts","names":[],"sources":["../src/config.ts","../src/plugin.ts","../src/uploader.ts","../src/service.ts"],"mappings":";;;;KAAY;oBAEA;EACV;EACA;EACA;EACA;;UAGe;EACf,UAAU;EACV;EACA;EACA;EACA;EACA;EACA,YAAY;EACZ;EACA,UAAU;;;;wBCHI,SAAS,QAAQ,WAAW;;;UCTlC;EACR;EACA;EACA;EACA;EACA;;UAGQ;EACR,eAAe,qBAAqB;;qBAgBzB;mBACM;mBACA;mBACA;mBACA;EAEjB,YAAY,QAAQ,UAAU,QAAQ,KAAK;EAYrC,YAAY,SAAS,cAAc,QAAQ,WAAW;EAiC5D,mBAAmB;UAcX;UAqBA;EAqBF,gBAAgB;EAIhB,SAAS;;;;qBCzIJ,mBAAiB,QAAA,QAAA,YAAA;qBAGjB,sBAAmB,UAAc,eAAU,MAAA,MAAA;qBAG3C,kBAAe,QAClB,UAAQ,QACR,KAAK,qBAAgB,MAAA,MAAA"}

package/dist/index.d.mts

@@ -1,9 +1,9 @@
+import { Context, Layer } from "effect";
 import { Plugin } from "@open-wa/core";
 import { Logger } from "@open-wa/logger";
-
 //#region src/config.d.ts
 type CloudProvider = 'aws' | 'gcp' | 'do' | 'wasabi' | 'backblaze';
-declare enum DirectoryStrategy {
+export declare enum DirectoryStrategy {
   DATE = "DATE",
   CHAT = "CHAT",
   DATE_CHAT = "DATE_CHAT",
@@ -22,7 +22,7 @@ interface S3Config {
 }
 //#endregion
 //#region src/plugin.d.ts
-declare function s3Plugin(config: S3Config): Plugin;
+export declare function s3Plugin(config: S3Config): Plugin;
 //#endregion
 //#region src/uploader.d.ts
 interface MediaMessage {
@@ -35,18 +35,24 @@ interface MediaMessage {
 interface WAClient {
   decryptMedia: (message: unknown) => Promise<string>;
 }
-declare class S3Uploader {
+export declare class S3Uploader {
   private readonly config;
   private readonly logger;
   private readonly uploadQueue;
   private readonly processedFiles;
-  constructor(config: S3Config, logger: Logger);
+  constructor(config: S3Config, logger: Pick<Logger, 'error'>);
   uploadMedia(message: MediaMessage, client: WAClient): Promise<string | null>;
   getCloudUrlForFile(filename: string): string;
   private buildUploadOptions;
   private resolveDirectory;
   waitForQueue(): Promise<void>;
+  close(): Promise<void>;
 }
 //#endregion
-export { type CloudProvider, DirectoryStrategy, type S3Config, S3Uploader, s3Plugin };
+//#region src/service.d.ts
+export declare const S3UploaderService: Context.Service<S3Uploader, S3Uploader>;
+export declare const s3UploaderTestLayer: (uploader: S3Uploader) => Layer.Layer<S3Uploader, never, never>;
+export declare const s3UploaderLayer: (config: S3Config, logger: Pick<Logger, 'error'>) => Layer.Layer<S3Uploader, never, never>;
+//#endregion
+export type { CloudProvider, S3Config };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/config.ts","../src/plugin.ts","../src/uploader.ts"],"mappings":";;;;KAAY,aAAA;AAAA,aAEA,iBAAA;EACV,IAAA;EACA,IAAA;EACA,SAAA;EACA,SAAA;AAAA;AAAA,UAGe,QAAA;EACf,QAAA,EAAU,aAAA;EACV,WAAA;EACA,eAAA;EACA,MAAA;EACA,MAAA;EACA,MAAA;EACA,SAAA,GAAY,iBAAA;EACZ,iBAAA;EACA,OAAA,GAAU,MAAA;AAAA;;;iBCJI,QAAA,CAAS,MAAA,EAAQ,QAAA,GAAW,MAAA;;;UCRlC,YAAA;EACR,GAAA;EACA,QAAA;EACA,IAAA;EACA,MAAA;EACA,iBAAA;AAAA;AAAA,UAGQ,QAAA;EACR,YAAA,GAAe,OAAA,cAAqB,OAAA;AAAA;AAAA,cAgBzB,UAAA;EAAA,iBACM,MAAA;EAAA,iBACA,MAAA;EAAA,iBACA,WAAA;EAAA,iBACA,cAAA;cAEL,MAAA,EAAQ,QAAA,EAAU,MAAA,EAAQ,MAAA;EAUhC,WAAA,CAAY,OAAA,EAAS,YAAA,EAAc,MAAA,EAAQ,QAAA,GAAW,OAAA;EA8B5D,kBAAA,CAAmB,QAAA;EAAA,QAcX,kBAAA;EAAA,QAqBA,gBAAA;EAqBF,YAAA,CAAA,GAAgB,OAAA;AAAA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/config.ts","../src/plugin.ts","../src/uploader.ts","../src/service.ts"],"mappings":";;;;KAAY;oBAEA;EACV;EACA;EACA;EACA;;UAGe;EACf,UAAU;EACV;EACA;EACA;EACA;EACA;EACA,YAAY;EACZ;EACA,UAAU;;;;wBCHI,SAAS,QAAQ,WAAW;;;UCTlC;EACR;EACA;EACA;EACA;EACA;;UAGQ;EACR,eAAe,qBAAqB;;qBAgBzB;mBACM;mBACA;mBACA;mBACA;EAEjB,YAAY,QAAQ,UAAU,QAAQ,KAAK;EAYrC,YAAY,SAAS,cAAc,QAAQ,WAAW;EAiC5D,mBAAmB;UAcX;UAqBA;EAqBF,gBAAgB;EAIhB,SAAS;;;;qBCzIJ,mBAAiB,QAAA,QAAA,YAAA;qBAGjB,sBAAmB,UAAc,eAAU,MAAA,MAAA;qBAG3C,kBAAe,QAClB,UAAQ,QACR,KAAK,qBAAgB,MAAA,MAAA"}

package/dist/index.mjs

@@ -1,6 +1,7 @@
-import PQueue from "p-queue";
+import { Context, Effect, Layer, ManagedRuntime } from "effect";
 import { getCloudUrl, upload } from "pico-s3";
 import mime from "mime";
+import { ScopedTaskQueue } from "@open-wa/runtime-core";
 //#region src/config.ts
 let DirectoryStrategy = /* @__PURE__ */ function(DirectoryStrategy) {
 	DirectoryStrategy["DATE"] = "DATE";
@@ -16,10 +17,15 @@ var S3Uploader = class {
 		this.processedFiles = /* @__PURE__ */ new Set();
 		this.config = config;
 		this.logger = logger;
-		this.uploadQueue = new PQueue({
+		this.uploadQueue = ScopedTaskQueue.make({
+			name: "s3.upload",
 			concurrency: 2,
-			interval: 1e3,
-			intervalCap: 2
+			capacity: 64,
+			overload: "backpressure",
+			rate: {
+				intervalMs: 1e3,
+				limit: 2
+			}
 		});
 	}
 	async uploadMedia(message, client) {
@@ -31,8 +37,8 @@ var S3Uploader = class {
 		try {
 			const mediaData = await client.decryptMedia(message);
 			const opts = this.buildUploadOptions(filename, mediaData, message.from);
+			await (await this.uploadQueue).submit(() => upload(opts), filename);
 			this.processedFiles.add(filename);
-			await this.uploadQueue.add(() => upload(opts).catch(() => void 0));
 			return this.getCloudUrlForFile(filename);
 		} catch (error) {
 			this.logger.error(`Upload error: ${error.message}`);
@@ -40,7 +46,7 @@ var S3Uploader = class {
 		}
 	}
 	getCloudUrlForFile(filename) {
-		return getCloudUrl({
+		const opts = {
 			file: "",
 			filename,
 			provider: this.config.provider,
@@ -49,7 +55,8 @@ var S3Uploader = class {
 			bucket: this.config.bucket,
 			region: this.config.region,
 			public: this.config.public
-		});
+		};
+		return getCloudUrl(opts);
 	}
 	buildUploadOptions(filename, mediaData, from) {
 		const opts = {
@@ -73,44 +80,63 @@ var S3Uploader = class {
 		const cleanFrom = from.replace("@c.us", "").replace("@g.us", "");
 		const dateStr = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
 		switch (dirStrat) {
-			case DirectoryStrategy.DATE: return dateStr;
-			case DirectoryStrategy.CHAT: return cleanFrom;
-			case DirectoryStrategy.DATE_CHAT: return `${dateStr}/${cleanFrom}`;
-			case DirectoryStrategy.CHAT_DATE: return `${cleanFrom}/${dateStr}`;
+			case "DATE": return dateStr;
+			case "CHAT": return cleanFrom;
+			case "DATE_CHAT": return `${dateStr}/${cleanFrom}`;
+			case "CHAT_DATE": return `${cleanFrom}/${dateStr}`;
 			default: return typeof dirStrat === "string" ? dirStrat : void 0;
 		}
 	}
 	async waitForQueue() {
-		await this.uploadQueue.onIdle();
+		await (await this.uploadQueue).waitForIdle();
+	}
+	async close() {
+		await (await this.uploadQueue).close();
 	}
 };
 //#endregion
+//#region src/service.ts
+const S3UploaderService = Context.Service("@open-wa/integration-s3/S3Uploader");
+const s3UploaderTestLayer = (uploader) => Layer.succeed(S3UploaderService, uploader);
+const s3UploaderLayer = (config, logger) => Layer.effect(S3UploaderService, Effect.acquireRelease(Effect.sync(() => new S3Uploader(config, logger)), (uploader) => Effect.promise(async () => {
+	await uploader.waitForQueue();
+	await uploader.close();
+})));
+//#endregion
 //#region src/plugin.ts
 function s3Plugin(config) {
-	return async (input) => {
+	return Object.assign(async (input) => {
 		const { logger, client } = input;
-		const uploader = new S3Uploader(config, logger);
+		const runtime = ManagedRuntime.make(s3UploaderLayer(config, logger));
+		const uploader = await runtime.runPromise(S3UploaderService);
 		const getWAClient = () => {
 			if (client && typeof client === "object" && "decryptMedia" in client) return client;
 			return null;
 		};
 		return {
-			"message.received": async ({ message }) => {
-				const msg = message;
-				const waClient = getWAClient();
-				if (msg.deprecatedMms3Url && msg.mimetype && waClient) {
-					const cloudUrl = await uploader.uploadMedia(msg, waClient);
-					if (cloudUrl) msg.cloudUrl = cloudUrl;
-				}
-			},
+			"message.received": ({ message }) => runtime.runPromise(Effect.tryPromise({
+				try: async () => {
+					const msg = message;
+					const waClient = getWAClient();
+					if (msg.deprecatedMms3Url && msg.mimetype && waClient) {
+						const cloudUrl = await uploader.uploadMedia(msg, waClient);
+						if (cloudUrl) msg.cloudUrl = cloudUrl;
+					}
+				},
+				catch: (cause) => cause
+			})),
 			dispose: async () => {
-				await uploader.waitForQueue();
+				await runtime.dispose();
 				logger.info("S3 uploader queue drained");
 			}
 		};
-	};
+	}, { meta: {
+		name: "s3",
+		version: "5.0.0-alpha.7",
+		description: "Upload WhatsApp media to S3-compatible object storage"
+	} });
 }
 //#endregion
-export { DirectoryStrategy, S3Uploader, s3Plugin };
+export { DirectoryStrategy, S3Uploader, S3UploaderService, s3Plugin, s3UploaderLayer, s3UploaderTestLayer };
 
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":[],"sources":["../src/config.ts","../src/uploader.ts","../src/plugin.ts"],"sourcesContent":["export type CloudProvider = 'aws' | 'gcp' | 'do' | 'wasabi' | 'backblaze';\n\nexport enum DirectoryStrategy {\n  DATE = 'DATE',\n  CHAT = 'CHAT',\n  DATE_CHAT = 'DATE_CHAT',\n  CHAT_DATE = 'CHAT_DATE',\n}\n\nexport interface S3Config {\n  provider: CloudProvider;\n  accessKeyId: string;\n  secretAccessKey: string;\n  bucket: string;\n  region?: string;\n  public?: boolean;\n  directory?: DirectoryStrategy | string;\n  ignoreHostAccount?: boolean;\n  headers?: Record<string, string>;\n}\n","import PQueue from 'p-queue';\nimport { upload, getCloudUrl } from 'pico-s3';\nimport mime from 'mime';\nimport type { Logger } from '@open-wa/logger';\nimport { type S3Config, DirectoryStrategy } from './config.js';\n\ninterface MediaMessage {\n  mId?: string;\n  mimetype: string;\n  from: string;\n  fromMe?: boolean;\n  deprecatedMms3Url?: string;\n}\n\ninterface WAClient {\n  decryptMedia: (message: unknown) => Promise<string>;\n}\n\ninterface S3UploadOpts {\n  file: string;\n  filename: string;\n  provider: string;\n  accessKeyId: string;\n  secretAccessKey: string;\n  bucket: string;\n  region?: string;\n  public?: boolean;\n  headers?: Record<string, string>;\n  directory?: string;\n}\n\nexport class S3Uploader {\n  private readonly config: S3Config;\n  private readonly logger: Logger;\n  private readonly uploadQueue: PQueue;\n  private readonly processedFiles: Set<string> = new Set();\n\n  constructor(config: S3Config, logger: Logger) {\n    this.config = config;\n    this.logger = logger;\n    this.uploadQueue = new PQueue({\n      concurrency: 2,\n      interval: 1000,\n      intervalCap: 2,\n    });\n  }\n\n  async uploadMedia(message: MediaMessage, client: WAClient): Promise<string | null> {\n    if (!message.deprecatedMms3Url || !message.mimetype) {\n      return null;\n    }\n\n    if (message.fromMe && this.config.ignoreHostAccount) {\n      return null;\n    }\n\n    const extension = mime.getExtension(message.mimetype) ?? 'bin';\n    const filename = `${message.mId ?? Date.now()}.${extension}`;\n\n    if (this.processedFiles.has(filename)) {\n      return this.getCloudUrlForFile(filename);\n    }\n\n    try {\n      const mediaData = await client.decryptMedia(message);\n      const opts = this.buildUploadOptions(filename, mediaData, message.from);\n\n      this.processedFiles.add(filename);\n      await this.uploadQueue.add(() => upload(opts as never).catch(() => undefined));\n\n      return this.getCloudUrlForFile(filename);\n    } catch (error) {\n      this.logger.error(`Upload error: ${(error as Error).message}`);\n      return null;\n    }\n  }\n\n  getCloudUrlForFile(filename: string): string {\n    const opts: S3UploadOpts = {\n      file: '',\n      filename,\n      provider: this.config.provider,\n      accessKeyId: this.config.accessKeyId,\n      secretAccessKey: this.config.secretAccessKey,\n      bucket: this.config.bucket,\n      region: this.config.region,\n      public: this.config.public,\n    };\n    return getCloudUrl(opts as never);\n  }\n\n  private buildUploadOptions(filename: string, mediaData: string, from: string): S3UploadOpts {\n    const opts: S3UploadOpts = {\n      file: mediaData,\n      filename,\n      provider: this.config.provider,\n      accessKeyId: this.config.accessKeyId,\n      secretAccessKey: this.config.secretAccessKey,\n      bucket: this.config.bucket,\n      region: this.config.region,\n      public: this.config.public,\n      headers: this.config.headers,\n    };\n\n    const directory = this.resolveDirectory(from);\n    if (directory) {\n      opts.directory = directory;\n    }\n\n    return opts;\n  }\n\n  private resolveDirectory(from: string): string | undefined {\n    const dirStrat = this.config.directory;\n    if (!dirStrat) return undefined;\n\n    const cleanFrom = from.replace('@c.us', '').replace('@g.us', '');\n    const dateStr = new Date().toISOString().slice(0, 10);\n\n    switch (dirStrat) {\n      case DirectoryStrategy.DATE:\n        return dateStr;\n      case DirectoryStrategy.CHAT:\n        return cleanFrom;\n      case DirectoryStrategy.DATE_CHAT:\n        return `${dateStr}/${cleanFrom}`;\n      case DirectoryStrategy.CHAT_DATE:\n        return `${cleanFrom}/${dateStr}`;\n      default:\n        return typeof dirStrat === 'string' ? dirStrat : undefined;\n    }\n  }\n\n  async waitForQueue(): Promise<void> {\n    await this.uploadQueue.onIdle();\n  }\n}\n","import type { Plugin, PluginInput, Hooks } from '@open-wa/core';\nimport type { S3Config } from './config.js';\nimport { S3Uploader } from './uploader.js';\n\ninterface MediaMessage {\n  deprecatedMms3Url?: string;\n  mimetype?: string;\n  cloudUrl?: string;\n}\n\ninterface WAClient {\n  decryptMedia: (message: unknown) => Promise<string>;\n}\n\nexport function s3Plugin(config: S3Config): Plugin {\n  return async (input: PluginInput): Promise<Hooks> => {\n    const { logger, client } = input;\n    const uploader = new S3Uploader(config, logger);\n\n    const getWAClient = (): WAClient | null => {\n      if (client && typeof client === 'object' && 'decryptMedia' in client) {\n        return client as WAClient;\n      }\n      return null;\n    };\n\n    return {\n      'message.received': async ({ message }) => {\n        const msg = message as MediaMessage;\n        const waClient = getWAClient();\n\n        if (msg.deprecatedMms3Url && msg.mimetype && waClient) {\n          const cloudUrl = await uploader.uploadMedia(msg as never, waClient);\n          if (cloudUrl) {\n            msg.cloudUrl = cloudUrl;\n          }\n        }\n      },\n\n      dispose: async () => {\n        await uploader.waitForQueue();\n        logger.info('S3 uploader queue drained');\n      },\n    };\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"index.mjs","names":[],"sources":["../src/config.ts","../src/uploader.ts","../src/service.ts","../src/plugin.ts"],"sourcesContent":["export type CloudProvider = 'aws' | 'gcp' | 'do' | 'wasabi' | 'backblaze';\n\nexport enum DirectoryStrategy {\n  DATE = 'DATE',\n  CHAT = 'CHAT',\n  DATE_CHAT = 'DATE_CHAT',\n  CHAT_DATE = 'CHAT_DATE',\n}\n\nexport interface S3Config {\n  provider: CloudProvider;\n  accessKeyId: string;\n  secretAccessKey: string;\n  bucket: string;\n  region?: string;\n  public?: boolean;\n  directory?: DirectoryStrategy | string;\n  ignoreHostAccount?: boolean;\n  headers?: Record<string, string>;\n}\n","import { upload, getCloudUrl } from 'pico-s3';\nimport mime from 'mime';\nimport type { Logger } from '@open-wa/logger';\nimport { ScopedTaskQueue } from '@open-wa/runtime-core';\nimport { type S3Config, DirectoryStrategy } from './config';\n\ninterface MediaMessage {\n  mId?: string;\n  mimetype: string;\n  from: string;\n  fromMe?: boolean;\n  deprecatedMms3Url?: string;\n}\n\ninterface WAClient {\n  decryptMedia: (message: unknown) => Promise<string>;\n}\n\ninterface S3UploadOpts {\n  file: string;\n  filename: string;\n  provider: string;\n  accessKeyId: string;\n  secretAccessKey: string;\n  bucket: string;\n  region?: string;\n  public?: boolean;\n  headers?: Record<string, string>;\n  directory?: string;\n}\n\nexport class S3Uploader {\n  private readonly config: S3Config;\n  private readonly logger: Pick<Logger, 'error'>;\n  private readonly uploadQueue: Promise<ScopedTaskQueue>;\n  private readonly processedFiles: Set<string> = new Set();\n\n  constructor(config: S3Config, logger: Pick<Logger, 'error'>) {\n    this.config = config;\n    this.logger = logger;\n    this.uploadQueue = ScopedTaskQueue.make({\n      name: 's3.upload',\n      concurrency: 2,\n      capacity: 64,\n      overload: 'backpressure',\n      rate: { intervalMs: 1000, limit: 2 },\n    });\n  }\n\n  async uploadMedia(message: MediaMessage, client: WAClient): Promise<string | null> {\n    if (!message.deprecatedMms3Url || !message.mimetype) {\n      return null;\n    }\n\n    if (message.fromMe && this.config.ignoreHostAccount) {\n      return null;\n    }\n\n    const extension = mime.getExtension(message.mimetype) ?? 'bin';\n    const filename = `${message.mId ?? Date.now()}.${extension}`;\n\n    if (this.processedFiles.has(filename)) {\n      return this.getCloudUrlForFile(filename);\n    }\n\n    try {\n      const mediaData = await client.decryptMedia(message);\n      const opts = this.buildUploadOptions(filename, mediaData, message.from);\n\n      await (await this.uploadQueue).submit(\n        () => upload(opts as never),\n        filename,\n      );\n      this.processedFiles.add(filename);\n\n      return this.getCloudUrlForFile(filename);\n    } catch (error) {\n      this.logger.error(`Upload error: ${(error as Error).message}`);\n      return null;\n    }\n  }\n\n  getCloudUrlForFile(filename: string): string {\n    const opts: S3UploadOpts = {\n      file: '',\n      filename,\n      provider: this.config.provider,\n      accessKeyId: this.config.accessKeyId,\n      secretAccessKey: this.config.secretAccessKey,\n      bucket: this.config.bucket,\n      region: this.config.region,\n      public: this.config.public,\n    };\n    return getCloudUrl(opts as never);\n  }\n\n  private buildUploadOptions(filename: string, mediaData: string, from: string): S3UploadOpts {\n    const opts: S3UploadOpts = {\n      file: mediaData,\n      filename,\n      provider: this.config.provider,\n      accessKeyId: this.config.accessKeyId,\n      secretAccessKey: this.config.secretAccessKey,\n      bucket: this.config.bucket,\n      region: this.config.region,\n      public: this.config.public,\n      headers: this.config.headers,\n    };\n\n    const directory = this.resolveDirectory(from);\n    if (directory) {\n      opts.directory = directory;\n    }\n\n    return opts;\n  }\n\n  private resolveDirectory(from: string): string | undefined {\n    const dirStrat = this.config.directory;\n    if (!dirStrat) return undefined;\n\n    const cleanFrom = from.replace('@c.us', '').replace('@g.us', '');\n    const dateStr = new Date().toISOString().slice(0, 10);\n\n    switch (dirStrat) {\n      case DirectoryStrategy.DATE:\n        return dateStr;\n      case DirectoryStrategy.CHAT:\n        return cleanFrom;\n      case DirectoryStrategy.DATE_CHAT:\n        return `${dateStr}/${cleanFrom}`;\n      case DirectoryStrategy.CHAT_DATE:\n        return `${cleanFrom}/${dateStr}`;\n      default:\n        return typeof dirStrat === 'string' ? dirStrat : undefined;\n    }\n  }\n\n  async waitForQueue(): Promise<void> {\n    await (await this.uploadQueue).waitForIdle();\n  }\n\n  async close(): Promise<void> {\n    await (await this.uploadQueue).close();\n  }\n}\n","import type { Logger } from '@open-wa/logger';\nimport { Context, Effect, Layer } from 'effect';\nimport type { S3Config } from './config';\nimport { S3Uploader } from './uploader';\n\nexport const S3UploaderService =\n  Context.Service<S3Uploader>('@open-wa/integration-s3/S3Uploader');\n\nexport const s3UploaderTestLayer = (uploader: S3Uploader) =>\n  Layer.succeed(S3UploaderService, uploader);\n\nexport const s3UploaderLayer = (\n  config: S3Config,\n  logger: Pick<Logger, 'error'>,\n) => Layer.effect(\n  S3UploaderService,\n  Effect.acquireRelease(\n    Effect.sync(() => new S3Uploader(config, logger)),\n    (uploader) => Effect.promise(async () => {\n      await uploader.waitForQueue();\n      await uploader.close();\n    }),\n  ),\n);\n","import type { Plugin, PluginInput, Hooks } from '@open-wa/core';\nimport type { S3Config } from './config';\nimport { Effect, ManagedRuntime } from 'effect';\nimport { S3UploaderService, s3UploaderLayer } from './service';\n\ninterface MediaMessage {\n  deprecatedMms3Url?: string;\n  mimetype?: string;\n  cloudUrl?: string;\n}\n\ninterface WAClient {\n  decryptMedia: (message: unknown) => Promise<string>;\n}\n\nexport function s3Plugin(config: S3Config): Plugin {\n  return Object.assign(async (input: PluginInput): Promise<Hooks> => {\n    const { logger, client } = input;\n    const runtime = ManagedRuntime.make(s3UploaderLayer(config, logger));\n    const uploader = await runtime.runPromise(S3UploaderService);\n\n    const getWAClient = (): WAClient | null => {\n      if (client && typeof client === 'object' && 'decryptMedia' in client) {\n        return client as WAClient;\n      }\n      return null;\n    };\n\n    return {\n      'message.received': ({ message }) => runtime.runPromise(Effect.tryPromise({\n        try: async () => {\n          const msg = message as MediaMessage;\n          const waClient = getWAClient();\n\n          if (msg.deprecatedMms3Url && msg.mimetype && waClient) {\n            const cloudUrl = await uploader.uploadMedia(msg as never, waClient);\n            if (cloudUrl) {\n              msg.cloudUrl = cloudUrl;\n            }\n          }\n        },\n        catch: (cause) => cause,\n      })),\n\n      dispose: async () => {\n        await runtime.dispose();\n        logger.info('S3 uploader queue drained');\n      },\n    };\n  }, {\n    meta: {\n      name: 's3',\n      version: '5.0.0-alpha.7',\n      description: 'Upload WhatsApp media to S3-compatible object storage',\n    },\n  });\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-wa/integration-s3",
-  "version": "5.0.0-alpha.8",
+  "version": "5.1.0",
   "description": "S3/Cloud storage integration plugin for open-wa",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -13,15 +13,17 @@
     }
   },
   "dependencies": {
-    "mime": "^4.0.0",
-    "p-queue": "^8.0.0",
-    "pico-s3": "^1.0.0",
-    "@open-wa/core": "5.0.0-alpha.8",
-    "@open-wa/logger": "5.0.0-alpha.8"
+    "@open-wa/core": "5.1.0",
+    "@open-wa/logger": "5.1.0",
+    "@open-wa/runtime-core": "5.0.1",
+    "effect": "4.0.0-beta.100",
+    "mime": "^4.1.0",
+    "pico-s3": "^2.11.0"
   },
   "devDependencies": {
-    "@types/node": "^25.9.1",
-    "typescript": "^6.0.3"
+    "@types/node": "^26.6.3",
+    "typescript": "^7.0.2",
+    "vitest": "5.0.2"
   },
   "publishConfig": {
     "access": "public"
@@ -31,9 +33,15 @@
     "type": "git",
     "url": "https://github.com/open-wa/wa-automate-nodejs.git"
   },
+  "license": "SEE LICENSE IN LICENSE.md",
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "build": "tsdown src/index.ts --format esm --format cjs",
     "dev": "tsdown src/index.ts --format esm --format cjs --watch",
+    "test": "vitest run",
+    "typecheck": "tsc --noEmit",
     "lint": "oxlint src",
     "clean": "rimraf dist"
   }

package/.turbo/turbo-build.log

@@ -1,18 +0,0 @@
-$ tsdown src/index.ts --format esm --format cjs
-ℹ tsdown v0.21.7 powered by rolldown v1.0.0-rc.12
-ℹ config file: /home/runner/work/wa-automate-nodejs/wa-automate-nodejs/integrations/s3/tsdown.config.ts 
-ℹ entry: src/index.ts
-ℹ tsconfig: tsconfig.json
-ℹ Build start
-ℹ [CJS] dist/index.cjs  4.90 kB │ gzip: 1.75 kB
-ℹ [CJS] 1 files, total: 4.90 kB
-ℹ [CJS] dist/index.d.cts.map  0.78 kB │ gzip: 0.35 kB
-ℹ [CJS] dist/index.d.cts      1.46 kB │ gzip: 0.66 kB
-ℹ [CJS] 2 files, total: 2.24 kB
-✔ Build complete in 3592ms
-ℹ [ESM] dist/index.mjs        3.73 kB │ gzip: 1.31 kB
-ℹ [ESM] dist/index.mjs.map    8.02 kB │ gzip: 2.55 kB
-ℹ [ESM] dist/index.d.mts.map  0.78 kB │ gzip: 0.35 kB
-ℹ [ESM] dist/index.d.mts      1.46 kB │ gzip: 0.66 kB
-ℹ [ESM] 4 files, total: 13.99 kB
-✔ Build complete in 3595ms

package/CHANGELOG.md

@@ -1,77 +0,0 @@
-# @open-wa/integration-s3
-
-## 5.0.0-alpha.8
-
-### Patch Changes
-
-- Updated dependencies [[`6a55aef`](https://github.com/open-wa/wa-automate-nodejs/commit/6a55aef602b347bfffc8550e448585e7776baf18)]:
-  - @open-wa/core@5.0.0-alpha.8
-  - @open-wa/logger@5.0.0-alpha.8
-
-## 5.0.0-alpha.7
-
-### Patch Changes
-
-- Updated dependencies []:
-  - @open-wa/core@5.0.0-alpha.7
-  - @open-wa/logger@5.0.0-alpha.7
-
-## 5.0.0-alpha.6
-
-### Patch Changes
-
-- Updated dependencies []:
-  - @open-wa/core@5.0.0-alpha.6
-  - @open-wa/logger@5.0.0-alpha.6
-
-## 5.0.0-alpha.5
-
-### Patch Changes
-
-- Updated dependencies []:
-  - @open-wa/core@5.0.0-alpha.5
-  - @open-wa/logger@5.0.0-alpha.5
-
-## 5.0.0-alpha.4
-
-### Patch Changes
-
-- Updated dependencies []:
-  - @open-wa/core@5.0.0-alpha.4
-  - @open-wa/logger@5.0.0-alpha.4
-
-## 5.0.0-alpha.3
-
-### Patch Changes
-
-- Updated dependencies []:
-  - @open-wa/core@5.0.0-alpha.3
-  - @open-wa/logger@5.0.0-alpha.3
-
-## 5.0.0-alpha.2
-
-### Patch Changes
-
-- Updated dependencies []:
-  - @open-wa/core@5.0.0-alpha.2
-  - @open-wa/logger@5.0.0-alpha.2
-
-## 5.0.0-alpha.3
-
-### Minor Changes
-
-- Dry run minor bump
-
-### Patch Changes
-
-- Updated dependencies []:
-  - @open-wa/core@6.0.0-alpha.2
-  - @open-wa/logger@6.0.0-alpha.2
-
-## 5.0.0-alpha.2
-
-### Patch Changes
-
-- Updated dependencies []:
-  - @open-wa/core@5.0.1-alpha.2
-  - @open-wa/logger@5.0.1-alpha.2

package/src/config.ts

@@ -1,20 +0,0 @@
-export type CloudProvider = 'aws' | 'gcp' | 'do' | 'wasabi' | 'backblaze';
-
-export enum DirectoryStrategy {
-  DATE = 'DATE',
-  CHAT = 'CHAT',
-  DATE_CHAT = 'DATE_CHAT',
-  CHAT_DATE = 'CHAT_DATE',
-}
-
-export interface S3Config {
-  provider: CloudProvider;
-  accessKeyId: string;
-  secretAccessKey: string;
-  bucket: string;
-  region?: string;
-  public?: boolean;
-  directory?: DirectoryStrategy | string;
-  ignoreHostAccount?: boolean;
-  headers?: Record<string, string>;
-}

package/src/index.ts

@@ -1,3 +0,0 @@
-export { s3Plugin } from './plugin.js';
-export { type S3Config, type CloudProvider, DirectoryStrategy } from './config.js';
-export { S3Uploader } from './uploader.js';

package/src/plugin.ts

@@ -1,46 +0,0 @@
-import type { Plugin, PluginInput, Hooks } from '@open-wa/core';
-import type { S3Config } from './config.js';
-import { S3Uploader } from './uploader.js';
-
-interface MediaMessage {
-  deprecatedMms3Url?: string;
-  mimetype?: string;
-  cloudUrl?: string;
-}
-
-interface WAClient {
-  decryptMedia: (message: unknown) => Promise<string>;
-}
-
-export function s3Plugin(config: S3Config): Plugin {
-  return async (input: PluginInput): Promise<Hooks> => {
-    const { logger, client } = input;
-    const uploader = new S3Uploader(config, logger);
-
-    const getWAClient = (): WAClient | null => {
-      if (client && typeof client === 'object' && 'decryptMedia' in client) {
-        return client as WAClient;
-      }
-      return null;
-    };
-
-    return {
-      'message.received': async ({ message }) => {
-        const msg = message as MediaMessage;
-        const waClient = getWAClient();
-
-        if (msg.deprecatedMms3Url && msg.mimetype && waClient) {
-          const cloudUrl = await uploader.uploadMedia(msg as never, waClient);
-          if (cloudUrl) {
-            msg.cloudUrl = cloudUrl;
-          }
-        }
-      },
-
-      dispose: async () => {
-        await uploader.waitForQueue();
-        logger.info('S3 uploader queue drained');
-      },
-    };
-  };
-}

package/src/uploader.ts

@@ -1,137 +0,0 @@
-import PQueue from 'p-queue';
-import { upload, getCloudUrl } from 'pico-s3';
-import mime from 'mime';
-import type { Logger } from '@open-wa/logger';
-import { type S3Config, DirectoryStrategy } from './config.js';
-
-interface MediaMessage {
-  mId?: string;
-  mimetype: string;
-  from: string;
-  fromMe?: boolean;
-  deprecatedMms3Url?: string;
-}
-
-interface WAClient {
-  decryptMedia: (message: unknown) => Promise<string>;
-}
-
-interface S3UploadOpts {
-  file: string;
-  filename: string;
-  provider: string;
-  accessKeyId: string;
-  secretAccessKey: string;
-  bucket: string;
-  region?: string;
-  public?: boolean;
-  headers?: Record<string, string>;
-  directory?: string;
-}
-
-export class S3Uploader {
-  private readonly config: S3Config;
-  private readonly logger: Logger;
-  private readonly uploadQueue: PQueue;
-  private readonly processedFiles: Set<string> = new Set();
-
-  constructor(config: S3Config, logger: Logger) {
-    this.config = config;
-    this.logger = logger;
-    this.uploadQueue = new PQueue({
-      concurrency: 2,
-      interval: 1000,
-      intervalCap: 2,
-    });
-  }
-
-  async uploadMedia(message: MediaMessage, client: WAClient): Promise<string | null> {
-    if (!message.deprecatedMms3Url || !message.mimetype) {
-      return null;
-    }
-
-    if (message.fromMe && this.config.ignoreHostAccount) {
-      return null;
-    }
-
-    const extension = mime.getExtension(message.mimetype) ?? 'bin';
-    const filename = `${message.mId ?? Date.now()}.${extension}`;
-
-    if (this.processedFiles.has(filename)) {
-      return this.getCloudUrlForFile(filename);
-    }
-
-    try {
-      const mediaData = await client.decryptMedia(message);
-      const opts = this.buildUploadOptions(filename, mediaData, message.from);
-
-      this.processedFiles.add(filename);
-      await this.uploadQueue.add(() => upload(opts as never).catch(() => undefined));
-
-      return this.getCloudUrlForFile(filename);
-    } catch (error) {
-      this.logger.error(`Upload error: ${(error as Error).message}`);
-      return null;
-    }
-  }
-
-  getCloudUrlForFile(filename: string): string {
-    const opts: S3UploadOpts = {
-      file: '',
-      filename,
-      provider: this.config.provider,
-      accessKeyId: this.config.accessKeyId,
-      secretAccessKey: this.config.secretAccessKey,
-      bucket: this.config.bucket,
-      region: this.config.region,
-      public: this.config.public,
-    };
-    return getCloudUrl(opts as never);
-  }
-
-  private buildUploadOptions(filename: string, mediaData: string, from: string): S3UploadOpts {
-    const opts: S3UploadOpts = {
-      file: mediaData,
-      filename,
-      provider: this.config.provider,
-      accessKeyId: this.config.accessKeyId,
-      secretAccessKey: this.config.secretAccessKey,
-      bucket: this.config.bucket,
-      region: this.config.region,
-      public: this.config.public,
-      headers: this.config.headers,
-    };
-
-    const directory = this.resolveDirectory(from);
-    if (directory) {
-      opts.directory = directory;
-    }
-
-    return opts;
-  }
-
-  private resolveDirectory(from: string): string | undefined {
-    const dirStrat = this.config.directory;
-    if (!dirStrat) return undefined;
-
-    const cleanFrom = from.replace('@c.us', '').replace('@g.us', '');
-    const dateStr = new Date().toISOString().slice(0, 10);
-
-    switch (dirStrat) {
-      case DirectoryStrategy.DATE:
-        return dateStr;
-      case DirectoryStrategy.CHAT:
-        return cleanFrom;
-      case DirectoryStrategy.DATE_CHAT:
-        return `${dateStr}/${cleanFrom}`;
-      case DirectoryStrategy.CHAT_DATE:
-        return `${cleanFrom}/${dateStr}`;
-      default:
-        return typeof dirStrat === 'string' ? dirStrat : undefined;
-    }
-  }
-
-  async waitForQueue(): Promise<void> {
-    await this.uploadQueue.onIdle();
-  }
-}

package/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "dist"
-  },
-  "include": ["src/**/*.ts"],
-  "exclude": ["node_modules", "dist"]
-}

package/tsdown.config.ts

@@ -1,5 +0,0 @@
-import { defineConfig } from 'tsdown';
-
-export default defineConfig({
-  checks: { pluginTimings: false }
-});