From 2bb45fb16aa47f264d22a90c1654ce6082b847b7 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Mon, 29 Dec 2025 15:18:22 +0800 Subject: [PATCH] refactor(WAI): `urils/commons` --> `@haina/utils-commons` --- wai-server/.gitignore | 1 + wai-server/api/channels/channel.controller.js | 2 +- wai-server/core/handler/whatsappHandler.js | 2 +- wai-server/core/tripplanner/index.js | 2 +- wai-server/helper/wai.msg.helper.js | 2 +- wai-server/middleware/components/request_log.middleware.js | 2 +- wai-server/middleware/forward.middleware.js | 2 +- wai-server/package-lock.json | 7 +++++++ wai-server/package.json | 1 + wai-server/services/agent_sessions.service.js | 2 +- wai-server/services/outbound_messages.service.js | 2 +- 11 files changed, 17 insertions(+), 8 deletions(-) diff --git a/wai-server/.gitignore b/wai-server/.gitignore index a19365e..7079a86 100644 --- a/wai-server/.gitignore +++ b/wai-server/.gitignore @@ -40,3 +40,4 @@ baileys_auth_info_*/ baileys_auth_info/ temp/ +dist diff --git a/wai-server/api/channels/channel.controller.js b/wai-server/api/channels/channel.controller.js index c9ba6e7..9892230 100644 --- a/wai-server/api/channels/channel.controller.js +++ b/wai-server/api/channels/channel.controller.js @@ -4,7 +4,7 @@ const { sessionStore } = require('../../core'); // Import from core/index.js const { createWhatsApp } = require('../../core/baileys'); // Import from core/index.js const { getConnection } = require('../../services/connections.service'); const { upsert: upsertAgentSession } = require('../../services/agent_sessions.service'); -const { isEmpty } = require('../../utils/commons.util'); +const { isEmpty } = require('@haina/utils-commons'); const { getUserLogger } = require('../../utils/logger.util'); const { domain } = require('../../config').server; const waEmitter = require('../../core/emitter'); diff --git a/wai-server/core/handler/whatsappHandler.js b/wai-server/core/handler/whatsappHandler.js index 9400ac1..344aec9 100644 --- a/wai-server/core/handler/whatsappHandler.js +++ b/wai-server/core/handler/whatsappHandler.js @@ -10,7 +10,7 @@ const { sessionStore } = require('..'); const { createWhatsApp } = require('../../core/baileys'); const { updateConnection, addCurrentConnection, resetConnection, getConnection } = require('../../services/connections.service'); const { getOutboundMessageByIdOrExternalId, upsertOutboundMessage, createOutboundMessage } = require('../../services/outbound_messages.service'); -const { objectMapper, pick, isEmpty, omitEmpty } = require('../../utils/commons.util'); +const { objectMapper, pick, isEmpty, omitEmpty } = require('@haina/utils-commons'); const { logger, getUserLogger } = require('../../utils/logger.util'); const { DbData, waiContentToDB, uploadMediaFile, ctxToSendBuilder, ctxToDB } = require('../../helper/wai.msg.helper'); diff --git a/wai-server/core/tripplanner/index.js b/wai-server/core/tripplanner/index.js index 6574366..d193778 100644 --- a/wai-server/core/tripplanner/index.js +++ b/wai-server/core/tripplanner/index.js @@ -6,7 +6,7 @@ const plannerEvents = require('../emitter'); const { getConnection } = require('../../services/connections.service') const { getAgentSession, createAgentSession, update: updateAgentSession } = require('../../services/agent_sessions.service'); // const { getOutboundMessage, upsertOutboundMessage } = require('../../services/outbound_messages.service'); -const { isEmpty } = require('../../utils/commons.util'); +const { isEmpty } = require('@haina/utils-commons'); const { logger, getUserLogger } = require('../../utils/logger.util'); const { callAgentRounds } = require('../vendor/bailian.aliyun'); const { sendMessage } = require('../handler/whatsappHandler'); diff --git a/wai-server/helper/wai.msg.helper.js b/wai-server/helper/wai.msg.helper.js index eadbbaa..d100f44 100644 --- a/wai-server/helper/wai.msg.helper.js +++ b/wai-server/helper/wai.msg.helper.js @@ -2,7 +2,7 @@ * */ 'use strict'; -const { objectMapper, pick, isEmpty } = require('../utils/commons.util'); +const { objectMapper, pick, isEmpty } = require('@haina/utils-commons'); const mediaMsg = { contentToSend: msg => { diff --git a/wai-server/middleware/components/request_log.middleware.js b/wai-server/middleware/components/request_log.middleware.js index 96c38f4..6696a32 100644 --- a/wai-server/middleware/components/request_log.middleware.js +++ b/wai-server/middleware/components/request_log.middleware.js @@ -1,4 +1,4 @@ -const { isEmpty } = require('../../utils/commons.util'); +const { isEmpty } = require('@haina/utils-commons'); const { createRequestLog } = require('../../services/request_logs.service'); module.exports = async (ctx, next) => { diff --git a/wai-server/middleware/forward.middleware.js b/wai-server/middleware/forward.middleware.js index 1eae703..08f9966 100644 --- a/wai-server/middleware/forward.middleware.js +++ b/wai-server/middleware/forward.middleware.js @@ -1,5 +1,5 @@ const { domain } = require('../config').server; -const { isEmpty } = require('../utils/commons.util'); +const { isEmpty } = require('@haina/utils-commons'); const { getConnection } = require('../services/connections.service'); const axios = require('axios'); diff --git a/wai-server/package-lock.json b/wai-server/package-lock.json index 37a4d2a..7f6fdf1 100644 --- a/wai-server/package-lock.json +++ b/wai-server/package-lock.json @@ -9,6 +9,7 @@ "version": "0.1.0", "dependencies": { "@fullstax/p-retry": "^6.2.0-patch.4", + "@haina/utils-commons": "http://202.103.68.93:9000/npm/utils-commons-0.1.0.tgz", "@koa/cors": "2.2.3", "@koa/multer": "^3.0.2", "@whiskeysockets/baileys": "^6.7.21", @@ -641,6 +642,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@haina/utils-commons": { + "version": "0.1.0", + "resolved": "http://202.103.68.93:9000/npm/utils-commons-0.1.0.tgz", + "integrity": "sha512-/ClGSpxg+Er0wVjabJzTr3e1gvAPK8e0DE4KiUp1EAeFX/s5E0ummny30xTyrldKgvcWVvNMIM3X1nVdg1qWtw==", + "hasInstallScript": true + }, "node_modules/@hapi/boom": { "version": "9.1.4", "resolved": "https://registry.npmmirror.com/@hapi/boom/-/boom-9.1.4.tgz", diff --git a/wai-server/package.json b/wai-server/package.json index adf0089..901f10f 100644 --- a/wai-server/package.json +++ b/wai-server/package.json @@ -27,6 +27,7 @@ }, "dependencies": { "@fullstax/p-retry": "^6.2.0-patch.4", + "@haina/utils-commons": "http://202.103.68.93:9000/npm/utils-commons-0.1.0.tgz", "@koa/cors": "2.2.3", "@koa/multer": "^3.0.2", "@whiskeysockets/baileys": "^6.7.21", diff --git a/wai-server/services/agent_sessions.service.js b/wai-server/services/agent_sessions.service.js index 1f3075d..0b81f71 100644 --- a/wai-server/services/agent_sessions.service.js +++ b/wai-server/services/agent_sessions.service.js @@ -2,7 +2,7 @@ const db = require('../config').database; const { domain, name } = require('../config').server; -const { objectMapper, pick, isEmpty } = require('../utils/commons.util'); +const { objectMapper, pick, isEmpty } = require('@haina/utils-commons'); const initModels = require('../models/init-models'); const Sequelize = db.sequelize; diff --git a/wai-server/services/outbound_messages.service.js b/wai-server/services/outbound_messages.service.js index d0e5766..bc911f0 100644 --- a/wai-server/services/outbound_messages.service.js +++ b/wai-server/services/outbound_messages.service.js @@ -2,7 +2,7 @@ const db = require('../config').database; const { domain, name } = require('../config').server; -const { objectMapper, pick, isEmpty } = require('../utils/commons.util'); +const { objectMapper, pick, isEmpty } = require('@haina/utils-commons'); const initModels = require('../models/init-models'); const { sequelize: Sequelize, Op } = db;