Merge branch 'master' into features/add-x-qiniu-date

Author: xwen-winnie

.gitignore

@@ -23,3 +23,5 @@ package-lock.json
 
 coverage/
 .nyc_output/
+.idea
+yarn.lock

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## CHANGE LOG
 
+## 7.6.1
+- 添加sms typing
 
 ## 7.6.0
 - 对象存储，新增 setObjectLifeCycle 设置对象生命周期 API

index.d.ts

@@ -3,6 +3,8 @@
  * @date 2017-06-27
  * @author xialeistudio<[email protected]>
  */
+import { Callback } from 'urllib';
+
 export declare type callback = (e?: Error, respBody?: any, respInfo?: any) => void;
 
 export declare namespace auth {
@@ -967,3 +969,75 @@ export declare namespace rs {
         uploadToken(mac?: auth.digest.Mac): string;
     }
 }
+
+export declare namespace sms {
+  namespace message {
+    /**
+     * 发送短信 (POST Message)
+     * @link https://developer.qiniu.com/sms/5897/sms-api-send-message#1
+     * @param reqBody
+     * @param mac
+     * @param callback
+     */
+    function sendMessage(
+      reqBody: {
+        "template_id": string,
+        "mobiles": string[],
+        "parameters"?: Record<string, string>
+      },
+      mac: auth.digest.Mac,
+      callback: Callback<{ job_id: string }>
+    ): void;
+
+    /**
+     * 发送单条短信 (POST Single Message)
+     * @link https://developer.qiniu.com/sms/5897/sms-api-send-message#2
+     * @param reqBody
+     * @param mac
+     * @param callback
+     */
+    function sendSingleMessage(
+      reqBody: {
+        "template_id": string,
+        "mobile": string,
+        "parameters"?: Record<string, string>
+      },
+      mac: auth.digest.Mac,
+      callback: Callback<{ message_id: string }>
+    ): void;
+
+    /**
+     * 发送国际/港澳台短信 (POST Oversea Message)
+     * @link https://developer.qiniu.com/sms/5897/sms-api-send-message#3
+     * @param reqBody
+     * @param mac
+     * @param callback
+     */
+    function sendOverseaMessage(
+      reqBody: {
+        "template_id": string,
+        "mobile": string,
+        "parameters"?: Record<string, string>
+      },
+      mac: auth.digest.Mac,
+      callback: Callback<{ message_id: string }>
+    ): void;
+
+    /**
+     * 发送全文本短信(不需要传模版 ID) (POST Fulltext Message)
+     * @link https://developer.qiniu.com/sms/5897/sms-api-send-message#4
+     * @param reqBody
+     * @param mac
+     * @param callback
+     */
+    function sendFulltextMessage(
+      reqBody: {
+        "mobiles": string[],
+        "content": string,
+        "template_type": string
+      },
+      mac: auth.digest.Mac,
+      callback: Callback<{ job_id: string }>
+    ): void;
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "qiniu",
-  "version": "7.6.0",
+  "version": "7.6.1",
   "description": "Node wrapper for Qiniu Resource (Cloud) Storage API",
   "main": "index.js",
   "directories": {