aragog-client 0.2.1 → 1.0.2

package/lib/amqp.d.ts

@@ -11,11 +11,12 @@ export interface QueueParam {
 export interface Options {
     durable?: boolean;
 }
-export interface SendData extends QueueItem {
+export interface SendData extends Omit<QueueItem, 'appName'> {
     id: string;
     priority?: number;
 }
-export interface ResultData extends QueueResult {
+export interface ResultData<T = any> extends QueueResult {
+    data: T;
     id: string;
 }
 declare class Amqp extends EventEmitter {

package/lib/amqp.js

@@ -38,7 +38,7 @@ class Amqp extends events_1.EventEmitter {
         else {
             callbackQueue = await this.channel.assertQueue('', { exclusive: true });
         }
-        await this.channel.bindQueue(dataQueue.queue, this.param.exchange, `#.${this.param.queue}`);
+        await this.channel.bindQueue(dataQueue.queue, this.param.exchange, `${this.param.app}.${this.param.queue}`);
         this.callbackQueueName = callbackQueue.queue;
         this.initialized = true;
     }
@@ -49,8 +49,10 @@ class Amqp extends events_1.EventEmitter {
         if (priority < 0 || priority > 10) {
             throw new Error('priority between 0-10');
         }
-        const { exchange, app, queue } = this.param;
-        await this.channel.publish(exchange, `${app}.${queue}`, Buffer.from(JSON.stringify(data)), {
+        await this.channel.publish(this.param.exchange, `${this.param.app}.${this.param.queue}`, Buffer.from(JSON.stringify({
+            ...data,
+            appName: this.param.app,
+        })), {
             priority,
             persistent: true,
             correlationId: id,

package/lib/index.d.ts

@@ -10,8 +10,8 @@ interface Options {
     durable?: boolean;
     exchangeName?: string;
 }
-interface TaskCompletedCallback {
-    (error: Error | undefined, data: ResultData): void | Promise<void>;
+interface TaskCompletedCallback<T> {
+    (error: Error | undefined, data: ResultData<T>): void | Promise<void>;
 }
 declare class Aragog {
     readonly connection: Connection;
@@ -22,7 +22,7 @@ declare class Aragog {
     isClosed: boolean;
     constructor(connection: Connection, managementApi: ReturnType<typeof createManagementApi>, headlessClient: Amqp, sourceClient: Amqp, options: Options);
     addTask(type: TaskType, data: SendData): Promise<void>;
-    onTaskCompleted(callback: TaskCompletedCallback): void;
+    onTaskCompleted<T>(callback: TaskCompletedCallback<T>): void;
     getServerInfo(): Promise<ConsumerInfo[]>;
     getQueueInfo(type: TaskType): Promise<QueueInfo>;
     close(): Promise<void>;
@@ -30,4 +30,5 @@ declare class Aragog {
 declare const connect: (connParam: AmqpConn & {
     appName: string;
 }, userOpts?: Options) => Promise<Aragog>;
+export declare type AragogClient = InstanceType<typeof Aragog>;
 export { connect, SendData as Task, ResultData as TaskResult, QueueInfo, ConsumerInfo };

package/lib/index.js

@@ -31,7 +31,7 @@ class Aragog {
         if (this.isClosed) {
             connectionClosedError();
         }
-        utils_1.checkTaskInput(data);
+        (0, utils_1.checkTaskInput)(data);
         if (type === TaskType.Headless) {
             await this.headlessClient.sendToQueue(data);
         }
@@ -66,7 +66,7 @@ class Aragog {
     }
 }
 const connect = async (connParam, userOpts = {}) => {
-    utils_1.checkConnectParam(connParam);
+    (0, utils_1.checkConnectParam)(connParam);
     const options = {
         exchangeName: 'aragog_exchange',
         durable: false,
@@ -86,6 +86,6 @@ const connect = async (connParam, userOpts = {}) => {
         exchange: options.exchangeName,
     }, options);
     await sourceClient.init();
-    return new Aragog(conn, management_1.createManagementApi(connParam, options), headlessClient, sourceClient, options);
+    return new Aragog(conn, (0, management_1.createManagementApi)(connParam, options), headlessClient, sourceClient, options);
 };
 exports.connect = connect;

package/lib/management.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createManagementApi = void 0;
 const axios_1 = __importDefault(require("axios"));
 /* eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types */
-exports.createManagementApi = (conn, { ssl = false }) => {
+const createManagementApi = (conn, { ssl = false }) => {
     const request = axios_1.default.create({
         baseURL: `${ssl ? 'https' : 'http'}://${conn.hostname}:${conn.port || 15672}/api/`,
         auth: {
@@ -20,3 +20,4 @@ exports.createManagementApi = (conn, { ssl = false }) => {
         getConsumers: () => request.get(`/consumers/${vhost}`).then(({ data }) => data),
     };
 };
+exports.createManagementApi = createManagementApi;

package/lib/types.d.ts

@@ -10,6 +10,7 @@ export interface Cookie {
 }
 
 export interface QueueItem {
+  appName: string
   url: string
   script: string
   disableImage?: boolean

package/lib/utils.d.ts

@@ -1,5 +1,6 @@
-import { AmqpConn, QueueItem } from './types';
-export declare const checkTaskInput: (data: QueueItem & {
+import { AmqpConn } from './types';
+import { SendData } from './amqp';
+export declare const checkTaskInput: (data: SendData & {
     id: string;
 }) => void;
 export declare const checkConnectParam: (connParam: AmqpConn & {

package/lib/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkConnectParam = exports.checkTaskInput = void 0;
-exports.checkTaskInput = (data) => {
+const checkTaskInput = (data) => {
     const allKeys = [
         'id',
         'url',
@@ -85,7 +85,8 @@ exports.checkTaskInput = (data) => {
         }
     });
 };
-exports.checkConnectParam = (connParam) => {
+exports.checkTaskInput = checkTaskInput;
+const checkConnectParam = (connParam) => {
     const allKeys = ['hostname', 'username', 'password', 'appName'];
     allKeys.forEach((key) => {
         if (!connParam[key]) {
@@ -96,3 +97,4 @@ exports.checkConnectParam = (connParam) => {
         }
     });
 };
+exports.checkConnectParam = checkConnectParam;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aragog-client",
-  "version": "0.2.1",
+  "version": "1.0.2",
   "description": "Aragog web scraping framework client",
   "keywords": [
     "scraping",
@@ -28,10 +28,8 @@
     "prepublishOnly": "ls lib"
   },
   "dependencies": {
-    "amqplib": "^0.5.6",
-    "axios": "^0.19.2"
-  },
-  "devDependencies": {
-    "@types/amqplib": "^0.5.13"
+    "@types/amqplib": "^0.8.2",
+    "amqplib": "^0.8.0",
+    "axios": "^0.24.0"
   }
 }

package/CHANGELOG.md

@@ -1,14 +0,0 @@
-# 更新日志
-
-## 0.2.1 (2020-06-19)
-
-- 修复 typescript 类型定义丢失
-
-## v0.2.0 (2020-06-18)
-
-- 修复库文件缺失
-- 新增 package.json homepage 字段
-
-## v0.1.1 (2020-06-17)
-
-- 创建项目