@jsm-mit/whatsapp-package 0.0.2 → 0.0.4

package/README.md

@@ -1 +1,15 @@
-## Whatapp-package
+## Whatapp-package
+
+### Uruchomienie lokalnie
+
+1. Zainstaluj zależności:
+   ```bash
+   npm install
+   npm install @jsm-mit/pigeon-package@0.0.12 @jsm-mit/utils-package@0.0.15 --save-dev
+   ```
+2. Uruchom skrypt lokalny:
+   ```bash
+   npm run local
+   ```
+
+Skrypt zbuduje projekt i uruchomi `sandbox/run-local.js`, który importuje bibliotekę z `dist/index.js`. Plik `sandbox/run-local.js` jest lokalnym narzędziem deweloperskim i nie jest częścią głównego API pakietu.

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export * from './whatsapp.service.js';
+export * from './whatsapp-message.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC"}

package/dist/index.js

@@ -1 +1,2 @@
 export * from './whatsapp.service.js';
+export * from './whatsapp-message.js';

package/dist/run-local.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=run-local.d.ts.map

package/dist/run-local.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-local.d.ts","sourceRoot":"","sources":["../src/run-local.ts"],"names":[],"mappings":""}

package/dist/run-local.js

@@ -0,0 +1,22 @@
+import { WhatsAppService } from './whatsapp.service.js';
+const pigeon = {
+    reportInfoAsyncSafe: async (title, message) => {
+        console.log(`[Pigeon] INFO ${title}:`, message);
+    },
+    reportUrgentAsyncSafe: async (title, message) => {
+        console.error(`[Pigeon] URGENT ${title}:`, message);
+    }
+};
+async function main() {
+    const service = new WhatsAppService(pigeon);
+    try {
+        await service.initialize();
+        console.log('✅ WhatsApp client initialized. Skopiuj i zeskanuj kod QR w terminalu.');
+        console.log('Ctrl+C to exit.');
+    }
+    catch (err) {
+        console.error('❌ Inicjalizacja nie powiodła się:', err);
+        process.exit(1);
+    }
+}
+main();

package/dist/whatsapp-message.d.ts

@@ -0,0 +1,12 @@
+export declare class WhatsAppMessage {
+    readonly id: string;
+    readonly from: string;
+    readonly to: string;
+    readonly body: string;
+    readonly timestamp: number;
+    readonly isForwarded: boolean;
+    readonly hasMedia: boolean;
+    readonly isFromAdmin: boolean;
+    constructor(originalMessage: any);
+}
+//# sourceMappingURL=whatsapp-message.d.ts.map

package/dist/whatsapp-message.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"whatsapp-message.d.ts","sourceRoot":"","sources":["../src/whatsapp-message.ts"],"names":[],"mappings":"AAIA,qBAAa,eAAe;IACxB,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,SAAS,EAAE,MAAM,CAAC;IAClC,SAAgB,WAAW,EAAE,OAAO,CAAC;IACrC,SAAgB,QAAQ,EAAE,OAAO,CAAC;IAClC,SAAgB,WAAW,EAAE,OAAO,CAAC;gBAEzB,eAAe,EAAE,GAAG;CAUnC"}

package/dist/whatsapp-message.js

@@ -0,0 +1,14 @@
+import { getEnvVariableUnsafe } from "@jsm-mit/utils-package";
+const adminNumber = getEnvVariableUnsafe('WHATSAPP_ADMIN_NUMBER');
+export class WhatsAppMessage {
+    constructor(originalMessage) {
+        this.id = originalMessage.id?.id || '';
+        this.from = originalMessage.from || '';
+        this.to = originalMessage.to || '';
+        this.body = originalMessage.body || '';
+        this.timestamp = originalMessage.timestamp || 0;
+        this.isForwarded = originalMessage.isForwarded || false;
+        this.hasMedia = originalMessage.hasMedia || false;
+        this.isFromAdmin = this.from.includes(adminNumber);
+    }
+}

package/dist/whatsapp.service.d.ts

@@ -1,11 +1,12 @@
 import { Observable } from 'rxjs';
 import type { Pigeon } from '@jsm-mit/pigeon-package';
+import { WhatsAppMessage } from './whatsapp-message.js';
 export declare class WhatsAppService {
     private pigeon;
     private readonly createdAt;
     private waClient;
     private readonly messageSubject;
-    get messages$(): Observable<any[]>;
+    get messages$(): Observable<WhatsAppMessage[]>;
     constructor(pigeon: Pigeon);
     private formatUptime;
     initialize(): Promise<void>;

package/dist/whatsapp.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"whatsapp.service.d.ts","sourceRoot":"","sources":["../src/whatsapp.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAW,MAAM,MAAM,CAAC;AAE3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAItD,qBAAa,eAAe;IAWpB,OAAO,CAAC,MAAM;IATlB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsB;IAChD,OAAO,CAAC,QAAQ,CAAM;IACtB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwB;IAEvD,IAAW,SAAS,IAAI,UAAU,CAAC,GAAG,EAAE,CAAC,CAExC;gBAGW,MAAM,EAAE,MAAM;IAI1B,OAAO,CAAC,YAAY;IAcb,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgHrB,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAc7D,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAQvE"}
+{"version":3,"file":"whatsapp.service.d.ts","sourceRoot":"","sources":["../src/whatsapp.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAW,MAAM,MAAM,CAAC;AAE3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMxD,qBAAa,eAAe;IAWpB,OAAO,CAAC,MAAM;IATlB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsB;IAChD,OAAO,CAAC,QAAQ,CAAM;IACtB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoC;IAEnE,IAAW,SAAS,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC,CAEpD;gBAGW,MAAM,EAAE,MAAM;IAI1B,OAAO,CAAC,YAAY;IAcb,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA8FrB,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAc7D,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAQvE"}

package/dist/whatsapp.service.js

@@ -1,8 +1,10 @@
 import pkg from 'whatsapp-web.js';
 import qrcode from 'qrcode-terminal';
 import { Observable, Subject } from 'rxjs';
-import { toJson, polandTimeOptions, serverTimeOptions } from '@jsm-mit/utils-package';
-const { Client: WAClient, LocalAuth } = pkg;
+import { toJson, polandTimeOptions, serverTimeOptions, getEnvVariableUnsafe } from '@jsm-mit/utils-package';
+import { WhatsAppMessage } from './whatsapp-message.js';
+const { Client, LocalAuth } = pkg;
+const adminNumber = getEnvVariableUnsafe('WHATSAPP_ADMIN_NUMBER');
 export class WhatsAppService {
     get messages$() {
         return this.messageSubject.asObservable();
@@ -33,7 +35,7 @@ export class WhatsAppService {
                 return resolve();
             }
             this.pigeon.reportInfoAsyncSafe('Log in to WhatsApp by scanning the QR code in the terminal required.', '');
-            this.waClient = new WAClient({
+            this.waClient = new Client({
                 authStrategy: new LocalAuth(),
                 puppeteer: {
                     headless: true,
@@ -47,7 +49,7 @@ export class WhatsAppService {
             this.waClient.on('ready', async () => {
                 try {
                     const uptime = this.formatUptime(Date.now() - this.createdAt);
-                    await this.sendMessageAsyncSafe("48601926367", `⚠️ Common Notifier is up for ${uptime}`);
+                    await this.sendMessageAsyncSafe(adminNumber, `⚠️ Common Notifier is up for ${uptime}`);
                     resolve();
                 }
                 catch (err) {
@@ -80,8 +82,9 @@ export class WhatsAppService {
                 return reject(err);
             });
             this.waClient.on('message', async (message) => {
+                const whatsappMessage = new WhatsAppMessage(message);
                 console.log(`[WhatsApp] Received message from ${message.from}: ${message.body}`);
-                if (message.body.toLowerCase() === 'ping') {
+                if (whatsappMessage.body.toLowerCase() === 'testuje ping') {
                     message.reply('pong').catch((err) => {
                         this.pigeon.reportUrgentAsyncSafe(`Error sending ping response`, toJson(err));
                         console.error('❌ Error sending ping response');
@@ -89,30 +92,14 @@ export class WhatsAppService {
                     });
                     return;
                 }
-                if (message.body.toLowerCase() === 'test') {
-                    this.sendMessageAsyncSafe("48601926367", `Test successful, application is up since ${new Date(this.createdAt).toLocaleDateString('pl-PL', polandTimeOptions)}, server time: ${new Date(this.createdAt).toLocaleTimeString('pl-PL', serverTimeOptions)}`);
+                if (whatsappMessage.isFromAdmin && whatsappMessage.body.toLowerCase() === 'testuje test') {
+                    this.sendMessageAsyncSafe(adminNumber, `Test successful, application is up since ${new Date(this.createdAt).toLocaleDateString('pl-PL', polandTimeOptions)}, server time: ${new Date(this.createdAt).toLocaleTimeString('pl-PL', serverTimeOptions)}`);
                     return;
                 }
-                // if (message.body.toLowerCase() === 'roundtrip') {
-                //     this.sendMessageAsyncSafe(
-                //         "48601926367",
-                //         `Roundtrip test started at ${new Date().toLocaleDateString('pl-PL', polandTimeOptions)}`
-                //     );
-                //     const args: AddTaskArgs = {
-                //         channel: this.channel,
-                //         payload: `Roundtrip test successful`,
-                //         parentIds: []
-                //     };
-                //     await this.actor.addTaskAsync(args, true).catch((err: any) => {
-                //         this.pigeon.reportUrgentAsyncSafe(`Error adding task`, toJson(err));
-                //         console.error('❌ Error adding task');
-                //         console.error(toJson(err));
-                //     });
-                //     return;
-                // }
                 const chat = await this.waClient.getChatById(message.from);
                 const messages = await chat.fetchMessages({ limit: 10 });
-                this.messageSubject.next(messages);
+                const whatsappMessages = messages?.map((msg) => new WhatsAppMessage(msg)) || [];
+                this.messageSubject.next(whatsappMessages);
             });
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsm-mit/whatsapp-package",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "",
   "homepage": "https://github.com/JSM-Common/whatsapp-package#readme",
   "bugs": {
@@ -28,6 +28,7 @@
     "build": "tsc --build",
     "clean": "rimraf dist",
     "prepare": "npm run build",
+    "local": "npm run build && node sandbox/run-local.js",
     "publish-public": "npm install && npm login && npm publish --access public",
     "test": "echo \"Error: no test specified\" && exit 1"
   },