@mango-power/node-kit 0.0.3 → 0.0.5

package/README.md

@@ -8,6 +8,7 @@ Shared node toolkit package for MP services.
 - `PGClient`
 - `RedisClient`
 - `RmqService`
+- `SLSClient`
 - `EmqxMqttService` / `EMQXMqttService`
 
 ## Build
@@ -33,6 +34,6 @@ registry=https://registry.npmjs.org/
 ## Install from other projects
 
 ```bash
-npm i @mango-power/node-kit@^0.0.3
+npm i @mango-power/node-kit@^0.0.5
 ```
 

package/dist/index.d.ts

@@ -2,5 +2,6 @@ export * from "./logger";
 export * from "./pg.service";
 export * from "./redis.service";
 export * from "./rmq.service";
+export * from "./sls.service";
 export * from "./mqtt/mqtt.type";
 export * from "./mqtt/emqx-mqtt.service";

package/dist/index.js

@@ -18,5 +18,6 @@ __exportStar(require("./logger"), exports);
 __exportStar(require("./pg.service"), exports);
 __exportStar(require("./redis.service"), exports);
 __exportStar(require("./rmq.service"), exports);
+__exportStar(require("./sls.service"), exports);
 __exportStar(require("./mqtt/mqtt.type"), exports);
 __exportStar(require("./mqtt/emqx-mqtt.service"), exports);

package/dist/mqtt/emqx-mqtt.service.d.ts

@@ -5,7 +5,7 @@ export interface MqttConfig {
     clientId?: string;
     username?: string;
     password?: string;
-    will?: any;
+    will?: mqtt.IClientOptions["will"];
 }
 export type MqttQos = 0 | 1 | 2;
 export interface MqttMessageContext {

package/dist/pg.service.d.ts

@@ -5,13 +5,13 @@ export declare class PGClientConfig {
     database: string;
     username: string;
     password: string;
-    ssl?: any;
+    ssl?: boolean;
     max?: number;
 }
 export declare class PGClient {
     private pool;
     init(config: PGClientConfig): Promise<void>;
-    query(sql: string, params?: any[]): Promise<any[]>;
-    queryOne(sql: string, params?: any[]): Promise<any>;
-    transaction(callback: (client: pg.PoolClient) => any): Promise<void>;
+    query<T = any>(sql: string, params?: readonly unknown[]): Promise<T[]>;
+    queryOne<T = any>(sql: string, params?: readonly unknown[]): Promise<T>;
+    transaction<T>(callback: (client: pg.PoolClient) => Promise<T> | T): Promise<T>;
 }

package/dist/pg.service.js

@@ -68,7 +68,7 @@ class PGClient {
         let error;
         const client = await this.pool.connect();
         try {
-            const { rows } = await client.query(sql, params);
+            const { rows } = params ? await client.query(sql, [...params]) : await client.query(sql);
             result = (0, humps_1.camelizeKeys)(rows);
         }
         catch (e) {
@@ -87,8 +87,8 @@ class PGClient {
         let result;
         const client = await this.pool.connect();
         try {
-            const { rows } = await client.query(sql, params);
-            result = (0, humps_1.camelizeKeys)(rows[0]) || {};
+            const { rows } = params ? await client.query(sql, [...params]) : await client.query(sql);
+            result = ((0, humps_1.camelizeKeys)(rows[0]) || {});
         }
         catch (e) {
             console.error("db error.", e);
@@ -103,9 +103,10 @@ class PGClient {
         const client = await this.pool.connect();
         await client.query("BEGIN");
         try {
-            await callback(client);
+            const result = await callback(client);
             await client.query("COMMIT");
             await client.release();
+            return result;
         }
         catch (e) {
             console.error("Transaction error.", e);

package/dist/redis.service.d.ts

@@ -1,21 +1,21 @@
 import Redis from "ioredis";
+import { RedisOptions } from "ioredis";
 export declare class RedisClientConfig {
     host: string;
     port: number;
     db: number;
     username?: string;
     password?: string;
-    tls?: any;
+    tls?: RedisOptions["tls"];
     keyPrefix?: string;
     cluster?: boolean;
 }
 export declare class RedisClient {
     client: Redis;
-    private config;
     init(config: RedisClientConfig): Promise<void>;
-    set(key: string, value: any, expire?: number): Promise<void>;
+    set(key: string, value: string | number | Buffer, expire?: number): Promise<void>;
     get(key: string): Promise<string | null>;
-    setJsonValue(key: string, value: any): Promise<"OK">;
-    getJsonValue(key: string): Promise<any>;
+    setJsonValue<T>(key: string, value: T): Promise<"OK" | null>;
+    getJsonValue<T>(key: string): Promise<T | null>;
     exists(key: string): Promise<number>;
 }

package/dist/redis.service.js

@@ -9,20 +9,15 @@ class RedisClientConfig {
 }
 exports.RedisClientConfig = RedisClientConfig;
 class RedisClient {
-    constructor() {
-        this.config = null;
-    }
     async init(config) {
-        this.config = config;
         try {
-            this.client = new ioredis_1.default({
+            const redisOptions = {
                 host: config.host,
                 port: config.port,
                 db: config.db,
                 username: config.username,
                 password: config.password,
                 disableClientInfo: true,
-                tls: config.tls || false,
                 reconnectOnError: (err) => {
                     console.warn("Reconnect on error:", err);
                     return true;
@@ -32,7 +27,11 @@ class RedisClient {
                     console.info(`Retrying connection in ${delay}ms`);
                     return delay;
                 },
-            });
+            };
+            if (config.tls) {
+                redisOptions.tls = config.tls;
+            }
+            this.client = new ioredis_1.default(redisOptions);
             this.client.on("error", (err) => {
                 console.error("Redis Error:", err);
             });
@@ -60,14 +59,16 @@ class RedisClient {
     }
     async getJsonValue(key) {
         const s = await this.client.get(key);
-        let r = {};
+        if (!s) {
+            return null;
+        }
         try {
-            r = JSON.parse(s);
+            return JSON.parse(s);
         }
         catch (e) {
             console.error(e);
+            return null;
         }
-        return r;
     }
     async exists(key) {
         return await this.client.exists(key);

package/dist/rmq.service.d.ts

@@ -1,5 +1,7 @@
 import * as amqp from "amqplib";
 import { Channel } from "amqplib";
+export type ConsumeMessage = amqp.ConsumeMessage;
+export type RmqConsumeCallback = (data: ConsumeMessage, channel: Channel) => Promise<void> | void;
 export declare class QueueItem {
     queue: string;
     prefetch?: number;
@@ -39,6 +41,6 @@ export declare class RmqService {
     private restoreConsumers;
     private startConsume;
     private closeAndClearChannels;
-    publishToExchange(exchange: string, routingKey: string | undefined, message: any, options?: amqp.Options.Publish): Promise<void>;
-    consumer(queue: string, callback: (data: amqp.ConsumeMessage, channel: Channel) => any): Promise<void>;
+    publishToExchange(exchange: string, routingKey: string | undefined, message: unknown, options?: amqp.Options.Publish): Promise<void>;
+    consumer(queue: string, callback: RmqConsumeCallback): Promise<void>;
 }

package/dist/sls.service.d.ts

@@ -0,0 +1,12 @@
+export interface SLSServiceConfig {
+    endpoint: string;
+    accessKeyId: string;
+    accessKeySecret: string;
+}
+export interface SlsLogClient {
+    postLogStoreLogs: (projectName: string, logstoreName: string, logGroup: unknown) => Promise<unknown>;
+}
+export declare class SLSClient {
+    client: SlsLogClient;
+    init(config: SLSServiceConfig): Promise<void>;
+}

package/dist/sls.service.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SLSClient = void 0;
+const Client = require("@alicloud/log");
+class SLSClient {
+    async init(config) {
+        this.client = new Client({
+            accessKeyId: config.accessKeyId,
+            accessKeySecret: config.accessKeySecret,
+            endpoint: config.endpoint,
+        });
+    }
+}
+exports.SLSClient = SLSClient;

package/dist/test/smoke.test.js

@@ -12,12 +12,14 @@ const index_1 = require("../index");
     const pg = new index_1.PGClient();
     const redis = new index_1.RedisClient();
     const rmq = new index_1.RmqService();
+    const sls = new index_1.SLSClient();
     const mqtt = new index_1.EmqxMqttService();
     const mqttCompat = new index_1.EMQXMqttService();
     const runner = new index_1.MqttTopicRunner();
     strict_1.default.ok(pg);
     strict_1.default.ok(redis);
     strict_1.default.ok(rmq);
+    strict_1.default.ok(sls);
     strict_1.default.ok(mqtt);
     strict_1.default.ok(mqttCompat);
     strict_1.default.ok(runner.id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mango-power/node-kit",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Shared node toolkit for mp services",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,6 +25,7 @@
   ],
   "license": "ISC",
   "dependencies": {
+    "@alicloud/log": "^1.2.6",
     "amqplib": "^0.10.9",
     "humps": "^2.0.1",
     "ioredis": "^5.8.1",