npm - node-nim - Versions diffs - 9.13.0 → 9.14.2 - Mend

node-nim 9.13.0 → 9.14.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/nim/talk.js +118 -2
package/dist/nim/talk.js.map +1 -1
package/package.json +74 -74
package/script/download-sdk.js +78 -78
package/script/exec-node-nim-tester.js +17 -17
package/types/nim/talk.d.ts +20 -3
package/types/nim_def/friend_def.d.ts +10 -11
package/types/nim_def/talk_def.d.ts +47 -2
package/types/nim_def/user_def.d.ts +11 -11

package/dist/nim/talk.js CHANGED Viewed

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NIMTalk = void 0;
 const loader_1 = __importDefault(require("../loader"));
 const eventemitter3_1 = require("eventemitter3");
+const msglog_def_1 = require("../nim_def/msglog_def");
 class NIMTalk extends eventemitter3_1.EventEmitter {
     constructor() {
         super();
@@ -21,8 +22,8 @@ class NIMTalk extends eventemitter3_1.EventEmitter {
      * @param pcb		上传进度的回调函数, 如果发送的消息里包含了文件资源,则通过此回调函数通知上传进度
      * @return void 无返回值
      */
-    sendMsg(msg, jsonExtension) {
-        return this.talk.SendMsg(msg, jsonExtension);
+    sendMsg(msg, jsonExtension, progressCb) {
+        return this.talk.SendMsg(msg, jsonExtension, progressCb);
     }
     /** 停止正在发送中的消息（目前只支持发送文件消息时的终止）
      * @param client_msg_id	停止发送的消息客户端id
@@ -57,6 +58,121 @@ class NIMTalk extends eventemitter3_1.EventEmitter {
             }, apnstext, pushpayloadconst, jsonExtension);
         });
     }
+    /** 创建文本消息 */
+    createTextMessage(receiver_id, session_type, client_msg_id, content, msg_setting, timetag, sub_type) {
+        return {
+            receiver_accid_: receiver_id,
+            session_type_: session_type,
+            client_msg_id_: client_msg_id,
+            content_: content,
+            msg_setting_: msg_setting,
+            timetag_: timetag,
+            sub_type_: sub_type,
+            type_: msglog_def_1.NIMMessageType.kNIMMessageTypeText
+        };
+    }
+    /** 创建文件消息 */
+    createFileMessage(receiver_id, session_type, client_msg_id, file, file_path, msg_setting, timetag, sub_type) {
+        return {
+            receiver_accid_: receiver_id,
+            session_type_: session_type,
+            client_msg_id_: client_msg_id,
+            attach_: JSON.stringify(file),
+            local_res_path_: file_path,
+            msg_setting_: msg_setting,
+            timetag_: timetag,
+            sub_type_: sub_type,
+            type_: msglog_def_1.NIMMessageType.kNIMMessageTypeFile
+        };
+    }
+    /** 创建图片消息 */
+    createImageMessage(receiver_id, session_type, client_msg_id, image, file_path, msg_setting, timetag, sub_type) {
+        return {
+            receiver_accid_: receiver_id,
+            session_type_: session_type,
+            client_msg_id_: client_msg_id,
+            attach_: JSON.stringify(image),
+            local_res_path_: file_path,
+            msg_setting_: msg_setting,
+            timetag_: timetag,
+            sub_type_: sub_type,
+            type_: msglog_def_1.NIMMessageType.kNIMMessageTypeImage
+        };
+    }
+    /** 创建语音消息 */
+    createAudioMessage(receiver_id, session_type, client_msg_id, audio, file_path, msg_setting, timetag, sub_type) {
+        return {
+            receiver_accid_: receiver_id,
+            session_type_: session_type,
+            client_msg_id_: client_msg_id,
+            attach_: JSON.stringify(audio),
+            local_res_path_: file_path,
+            msg_setting_: msg_setting,
+            timetag_: timetag,
+            sub_type_: sub_type,
+            type_: msglog_def_1.NIMMessageType.kNIMMessageTypeAudio
+        };
+    }
+    /** 创建视频消息 */
+    createVideoMessage(receiver_id, session_type, client_msg_id, video, file_path, msg_setting, timetag, sub_type) {
+        return {
+            receiver_accid_: receiver_id,
+            session_type_: session_type,
+            client_msg_id_: client_msg_id,
+            attach_: JSON.stringify(video),
+            local_res_path_: file_path,
+            msg_setting_: msg_setting,
+            timetag_: timetag,
+            sub_type_: sub_type,
+            type_: msglog_def_1.NIMMessageType.kNIMMessageTypeVideo
+        };
+    }
+    /** 创建位置消息 */
+    createLocationMessage(receiver_id, session_type, client_msg_id, location, msg_setting, timetag, sub_type) {
+        return {
+            receiver_accid_: receiver_id,
+            session_type_: session_type,
+            client_msg_id_: client_msg_id,
+            attach_: JSON.stringify(location),
+            msg_setting_: msg_setting,
+            timetag_: timetag,
+            sub_type_: sub_type,
+            type_: msglog_def_1.NIMMessageType.kNIMMessageTypeLocation
+        };
+    }
+    /** 创建提醒消息 */
+    createTipMessage(receiver_id, session_type, client_msg_id, tip, msg_setting, timetag, sub_type) {
+        return {
+            receiver_accid_: receiver_id,
+            session_type_: session_type,
+            client_msg_id_: client_msg_id,
+            content_: tip,
+            msg_setting_: msg_setting,
+            timetag_: timetag,
+            sub_type_: sub_type,
+            type_: msglog_def_1.NIMMessageType.kNIMMessageTypeTips
+        };
+    }
+    /** 创建转发消息 */
+    createRetweetMessage(sourceMessage, client_msg_id, session_type, receiver_id, msg_setting, timetag) {
+        let attachStr = '';
+        if (sourceMessage.attach_) {
+            let attach = JSON.parse(sourceMessage.attach_);
+            attach['retweeted_msg_id'] = sourceMessage.client_msg_id_;
+            attachStr = JSON.stringify(attach);
+        }
+        return {
+            receiver_accid_: receiver_id,
+            session_type_: session_type,
+            client_msg_id_: client_msg_id,
+            content_: sourceMessage.content_,
+            msg_setting_: msg_setting,
+            timetag_: timetag,
+            sub_type_: sourceMessage.sub_type_,
+            type_: sourceMessage.type_,
+            attach_: attachStr
+        };
+    }
     /** 从消息体中获取附件（图片、语音、视频等）的本地路径
      *  @param  msg	消息
      *  @return string	消息如果有附件，不管是否已下载，返回附件的本地路径；消息如果没有附件，返回空字符串。

package/dist/nim/talk.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"talk.js","sourceRoot":"","sources":["../../ts/nim/talk.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA2B;AAC3B,iDAA4C;~~AA4B5C~~,MAAa,OAAQ,SAAQ,4BAA2B;IAEpD;QACI,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,IAAI,GAAG,IAAI,gBAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC/D,CAAC;IAED,aAAa;IACb,iBAAiB;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAA;IACxC,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,GAAc,EAAE,aAAqB;~~QACzC~~,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,aAAa,CAAC,CAAA;~~IAChD~~,CAAC;IAED;;;;;OAKG;IACH,WAAW,CAAC,WAAmB,EAAE,IAAoB,EAAE,aAAqB;QACxE,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;IAClE,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,SAAS,CACL,GAAc,EACd,UAAkB,EAClB,EAA6B,EAC7B,QAAgB,EAChB,gBAAwB,EACxB,aAAqB;QAErB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,SAAS,CACf,GAAG,EACH,UAAU,EACV,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAChB,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;iBACtB;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;YAC9B,CAAC,EACD,QAAQ,EACR,gBAAgB,EAChB,aAAa,CAChB,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;OAGG;IACH,wBAAwB,CAAC,GAAc;QACnC,OAAO,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAA;IAClD,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,GAAc,EAAE,cAAsB;QAC/C,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;IACtD,CAAC;IAED;;;;OAIG;IACH,gBAAgB,CAAC,EAAgC,EAAE,aAAqB;QACpE,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,aAAa,CAAC,CAAA;IACxD,CAAC;IAED;;;;OAIG;IACH,yBAAyB,CAAC,EAAyC,EAAE,aAAqB;QACtF,OAAO,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,EAAE,EAAE,aAAa,CAAC,CAAA;IACjE,CAAC;CACJ;~~AA1GD~~,~~0BA0GC~~"}
1	+ {"version":3,"file":"talk.js","sourceRoot":"","sources":["../../ts/nim/talk.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,74 +1,74 @@
-{
-    "name": "node-nim",
-    "version": "9.13.0",
-    "description": "NetEase IM nodejs wrapper based on NetEase IM C++ SDK",
-    "main": "dist/node-nim.js",
-    "bin": {
-        "node-nim-tester": "node-nim-tester.js"
-    },
-    "types": "types/node-nim.d.ts",
-    "author": "Netease",
-    "license": "ISC",
-    "homepage": "https://github.com/netease-im/node-nim",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/netease-im/node-nim.git"
-    },
-    "scripts": {
-        "coverage": "nyc mocha test/test_all.js -slow 200 -timeout 10000",
-        "build_ts": "rimraf ./dist && rimraf ./types && tsc",
-        "build_wiki_doc": "typedoc --plugin typedoc-plugin-markdown --plugin typedoc-github-wiki-theme --theme github-wiki --out wiki_doc",
-        "build_markdown_doc": "typedoc --plugin typedoc-plugin-markdown --theme markdown --out markdown_doc",
-        "prepublishOnly": "npm run build_ts",
-        "install": "npm run download_sdk",
-        "download_sdk": "node -e \"require('./script/download-sdk.js').downloadSDK()\"",
-        "publish_to_netease_npm": "node script/publish-to-netease-npm.js"
-    },
-    "nyc": {
-        "cache": false,
-        "reporter": [
-            "lcov"
-        ]
-    },
-    "dependencies": {
-        "compare-versions": "^4.1.4",
-        "download": "^8.0.0",
-        "eventemitter3": "^4.0.7",
-        "node-fetch": "^2.6.9"
-    },
-    "optionalDependencies": {
-        "commander": "^8.3.0",
-        "hawk-web": "latest"
-    },
-    "devDependencies": {
-        "@types/node": "^16.18.23",
-        "@typescript-eslint/eslint-plugin": "^5.58.0",
-        "@typescript-eslint/parser": "^5.58.0",
-        "bluebird": "^3.7.2",
-        "cmake-js": "^6.3.2",
-        "eslint": "^7.32.0",
-        "git-describe": "^4.1.1",
-        "mocha": "^9.2.2",
-        "node-addon-api": "^4.3.0",
-        "nyc": "^15.1.0",
-        "typedoc": "^0.24.1",
-        "typedoc-github-wiki-theme": "^1.1.0",
-        "typedoc-plugin-markdown": "^3.15.1",
-        "typescript": "^4.9.5"
-    },
-    "keywords": [
-        "netease",
-        "nim",
-        "im sdk",
-        "nim sdk",
-        "nim node",
-        "nim electron"
-    ],
-    "files": [
-        "dist/",
-        "types/",
-        "package.json",
-        "script/",
-        "node-nim-tester.js"
-    ]
-}
+{
+    "name": "node-nim",
+    "version": "9.14.2",
+    "description": "NetEase IM nodejs wrapper based on NetEase IM C++ SDK",
+    "main": "dist/node-nim.js",
+    "bin": {
+        "node-nim-tester": "node-nim-tester.js"
+    },
+    "types": "types/node-nim.d.ts",
+    "author": "Netease",
+    "license": "ISC",
+    "homepage": "https://github.com/netease-im/node-nim",
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/netease-im/node-nim.git"
+    },
+    "scripts": {
+        "coverage": "nyc mocha test/test_all.js -slow 200 -timeout 10000",
+        "build_ts": "rimraf ./dist && rimraf ./types && tsc",
+        "build_wiki_doc": "typedoc --plugin typedoc-plugin-markdown --plugin typedoc-github-wiki-theme --theme github-wiki --out wiki_doc",
+        "build_markdown_doc": "typedoc --plugin typedoc-plugin-markdown --theme markdown --out markdown_doc",
+        "prepublishOnly": "npm run build_ts",
+        "install": "npm run download_sdk",
+        "download_sdk": "node -e \"require('./script/download-sdk.js').downloadSDK()\"",
+        "publish_to_netease_npm": "node script/publish-to-netease-npm.js"
+    },
+    "nyc": {
+        "cache": false,
+        "reporter": [
+            "lcov"
+        ]
+    },
+    "dependencies": {
+        "compare-versions": "^4.1.4",
+        "download": "^8.0.0",
+        "eventemitter3": "^4.0.7",
+        "node-fetch": "^2.6.9"
+    },
+    "optionalDependencies": {
+        "commander": "^8.3.0",
+        "hawk-web": "latest"
+    },
+    "devDependencies": {
+        "@types/node": "^16.18.23",
+        "@typescript-eslint/eslint-plugin": "^5.58.0",
+        "@typescript-eslint/parser": "^5.58.0",
+        "bluebird": "^3.7.2",
+        "cmake-js": "^6.3.2",
+        "eslint": "^7.32.0",
+        "git-describe": "^4.1.1",
+        "mocha": "^9.2.2",
+        "node-addon-api": "^4.3.0",
+        "nyc": "^15.1.0",
+        "typedoc": "^0.24.1",
+        "typedoc-github-wiki-theme": "^1.1.0",
+        "typedoc-plugin-markdown": "^3.15.1",
+        "typescript": "^4.9.5"
+    },
+    "keywords": [
+        "netease",
+        "nim",
+        "im sdk",
+        "nim sdk",
+        "nim node",
+        "nim electron"
+    ],
+    "files": [
+        "dist/",
+        "types/",
+        "package.json",
+        "script/",
+        "node-nim-tester.js"
+    ]
+}

package/script/download-sdk.js CHANGED Viewed

@@ -1,78 +1,78 @@
-const fetch = require('node-fetch')
-const fs = require('fs')
-const compareVersions = require('compare-versions')
-const download = require('download')
-const arch = process.env.npm_config_arch || process.arch
-const platform = process.env.npm_config_platform || process.platform
-const sdk_group = 'message'
-const sdk_name = 'nim'
-const sdk_path = `${__dirname}/../sdk`
-if (process.env.npm_config_ignoredownloadsdk) {
-    console.log('ignore download sdk')
-    process.exit(0)
-}
-let sdk_version
-let sdk_url = process.env.npm_config_nimsdkurl
-if (process.env.npm_package_version) {
-    sdk_version = process.env.npm_package_version.split('-')[0]
-}
-if (process.env.npm_config_nimsdkversion) {
-    sdk_version = process.env.npm_config_nimsdkversion
-}
-async function downloadSDK(custom_sdk_url) {
-    if (custom_sdk_url) {
-        sdk_url = custom_sdk_url
-    }
-    // fetch publish list
-    const res = await fetch('https://admin.netease.im/public-service/free/publish/list')
-    const publish_json = await res.json()
-    // get sdk list
-    if (!sdk_url) {
-        let latest_version = '0.0.0'
-        let latest_sdk_url = ''
-        Object.keys(publish_json.data[sdk_group]).forEach((temp) => {
-            if (compareVersions.compare(latest_version, temp, '<')) {
-                publish_json.data[sdk_group][temp].forEach((member) => {
-                    if (member.filename.includes(sdk_name) && member.filename.includes(platform) && member.filename.includes(arch)) {
-                        latest_version = temp
-                        latest_sdk_url = member.cdnlink
-                    }
-                })
-            }
-            if (sdk_version === temp) {
-                publish_json.data[sdk_group][temp].forEach((member) => {
-                    if (member.filename.includes(sdk_name) && member.filename.includes(platform) && member.filename.includes(arch)) {
-                        sdk_url = member.cdnlink
-                    }
-                })
-            }
-        })
-        if (!sdk_url || sdk_url.length === 0) {
-            console.log(`${sdk_name} sdk version ${sdk_version} not found, use latest version ${latest_version}`)
-            sdk_url = latest_sdk_url
-        }
-        console.log(`[node-nim] downloadSDK sdk_name:${sdk_name}, platform:${platform}, arch:${arch}`)
-    }
-    if (!sdk_url) {
-        console.error(`[node-nim] downloadSDK sdk_name:${sdk_name}, platform:${platform}, arch:${arch} not found`)
-        return
-    }
-    console.info(`[node-nim] Downloading prebuilt sdk from ${sdk_url} to ${sdk_path}`)
-    // remove sdk_path
-    if (fs.existsSync(sdk_path)) {
-        fs.rmSync(sdk_path, { recursive: true, force: true })
-    }
-    // download sdk
-    try {
-        await download(sdk_url, sdk_path, {
-            extract: true,
-            filter: (file) => {
-                return !file.path.includes('._')
-            }
-        })
-        console.info(`[node-nim] Downloading prebuilt sdk complete`)
-    } catch (err) {
-        console.error(`[node-nim] downloadSDK error:${err}`)
-    }
-}
-exports.downloadSDK = downloadSDK
+const fetch = require('node-fetch')
+const fs = require('fs')
+const compareVersions = require('compare-versions')
+const download = require('download')
+const arch = process.env.npm_config_arch || process.arch
+const platform = process.env.npm_config_platform || process.platform
+const sdk_group = 'message'
+const sdk_name = 'nim'
+const sdk_path = `${__dirname}/../sdk`
+if (process.env.npm_config_ignoredownloadsdk) {
+    console.log('ignore download sdk')
+    process.exit(0)
+}
+let sdk_version
+let sdk_url = process.env.npm_config_nimsdkurl
+if (process.env.npm_package_version) {
+    sdk_version = process.env.npm_package_version.split('-')[0]
+}
+if (process.env.npm_config_nimsdkversion) {
+    sdk_version = process.env.npm_config_nimsdkversion
+}
+async function downloadSDK(custom_sdk_url) {
+    if (custom_sdk_url) {
+        sdk_url = custom_sdk_url
+    }
+    // fetch publish list
+    const res = await fetch('https://admin.netease.im/public-service/free/publish/list')
+    const publish_json = await res.json()
+    // get sdk list
+    if (!sdk_url) {
+        let latest_version = '0.0.0'
+        let latest_sdk_url = ''
+        Object.keys(publish_json.data[sdk_group]).forEach((temp) => {
+            if (compareVersions.compare(latest_version, temp, '<')) {
+                publish_json.data[sdk_group][temp].forEach((member) => {
+                    if (member.filename.includes(sdk_name) && member.filename.includes(platform) && member.filename.includes(arch)) {
+                        latest_version = temp
+                        latest_sdk_url = member.cdnlink
+                    }
+                })
+            }
+            if (sdk_version === temp) {
+                publish_json.data[sdk_group][temp].forEach((member) => {
+                    if (member.filename.includes(sdk_name) && member.filename.includes(platform) && member.filename.includes(arch)) {
+                        sdk_url = member.cdnlink
+                    }
+                })
+            }
+        })
+        if (!sdk_url || sdk_url.length === 0) {
+            console.log(`${sdk_name} sdk version ${sdk_version} not found, use latest version ${latest_version}`)
+            sdk_url = latest_sdk_url
+        }
+        console.log(`[node-nim] downloadSDK sdk_name:${sdk_name}, platform:${platform}, arch:${arch}`)
+    }
+    if (!sdk_url) {
+        console.error(`[node-nim] downloadSDK sdk_name:${sdk_name}, platform:${platform}, arch:${arch} not found`)
+        return
+    }
+    console.info(`[node-nim] Downloading prebuilt sdk from ${sdk_url} to ${sdk_path}`)
+    // remove sdk_path
+    if (fs.existsSync(sdk_path)) {
+        fs.rmSync(sdk_path, { recursive: true, force: true })
+    }
+    // download sdk
+    try {
+        await download(sdk_url, sdk_path, {
+            extract: true,
+            filter: (file) => {
+                return !file.path.includes('._')
+            }
+        })
+        console.info(`[node-nim] Downloading prebuilt sdk complete`)
+    } catch (err) {
+        console.error(`[node-nim] downloadSDK error:${err}`)
+    }
+}
+exports.downloadSDK = downloadSDK

package/script/exec-node-nim-tester.js CHANGED Viewed

@@ -1,17 +1,17 @@
-const child_process = require('child_process')
-const fs = require('fs')
-const testDir = 'node-nim-tester'
-if (!fs.existsSync(testDir)) {
-    fs.mkdirSync(testDir)
-}
-process.chdir(testDir)
-child_process.execSync(`npm init --force`, { stdio: 'inherit' })
-child_process.execSync(`npm install node-nim@latest --registry=http://npm.netease.im/`, { stdio: 'inherit' })
-const args = process.argv.slice(2).join(' ')
-if (process.platform === 'win32') {
-    child_process.execSync(`.\\node_modules\\.bin\\node-nim-tester.cmd run ${args}`, { stdio: 'inherit' })
-} else {
-    child_process.execSync(`./node_modules/.bin/node-nim-tester run ${args}`, { stdio: 'inherit' })
-}
-process.chdir('..')
-fs.rmSync(testDir, { recursive: true, force: true })
+const child_process = require('child_process')
+const fs = require('fs')
+const testDir = 'node-nim-tester'
+if (!fs.existsSync(testDir)) {
+    fs.mkdirSync(testDir)
+}
+process.chdir(testDir)
+child_process.execSync(`npm init --force`, { stdio: 'inherit' })
+child_process.execSync(`npm install node-nim@latest --registry=http://npm.netease.im/`, { stdio: 'inherit' })
+const args = process.argv.slice(2).join(' ')
+if (process.platform === 'win32') {
+    child_process.execSync(`.\\node_modules\\.bin\\node-nim-tester.cmd run ${args}`, { stdio: 'inherit' })
+} else {
+    child_process.execSync(`./node_modules/.bin/node-nim-tester run ${args}`, { stdio: 'inherit' })
+}
+process.chdir('..')
+fs.rmSync(testDir, { recursive: true, force: true })

package/types/nim/talk.d.ts CHANGED Viewed

@@ -1,7 +1,8 @@
 import { EventEmitter } from 'eventemitter3';
-import { IMMessage, NIMMessageType } from '../nim_def/msglog_def';
-import { BroadcastMessage, MessageFilterCallback, NIMTalkAPI, RecallMsgNotify, RecallMsgsCallback, SendMessageArc, TeamNotificationFilterCallback } from '../nim_def/talk_def';
+import { IMMessage, MessageSetting, NIMMessageType } from '../nim_def/msglog_def';
+import { BroadcastMessage, FileUpPrgCallback, IMAudio, IMFile, IMImage, IMLocation, IMVideo, MessageFilterCallback, NIMTalkAPI, RecallMsgNotify, RecallMsgsCallback, SendMessageArc, TeamNotificationFilterCallback } from '../nim_def/talk_def';
 import { NIMResCode } from '../nim_def/client_def';
+import { NIMSessionType } from 'ts/node-nim';
 export declare interface NIMTalkEvents {
     /** 发送消息回调 */
     sendMsg: [SendMessageArc];
@@ -27,7 +28,7 @@ export declare class NIMTalk extends EventEmitter<NIMTalkEvents> {
      * @param pcb		上传进度的回调函数, 如果发送的消息里包含了文件资源,则通过此回调函数通知上传进度
      * @return void 无返回值
      */
-    sendMsg(msg: IMMessage, jsonExtension: string): void;
+    sendMsg(msg: IMMessage, jsonExtension: string, progressCb: FileUpPrgCallback): void;
     /** 停止正在发送中的消息（目前只支持发送文件消息时的终止）
      * @param client_msg_id	停止发送的消息客户端id
      * @param type			停止发送的消息类型
@@ -50,6 +51,22 @@ export declare class NIMTalk extends EventEmitter<NIMTalkEvents> {
      * </pre>
      */
     recallMsg(msg: IMMessage, notify_msg: string, cb: RecallMsgsCallback | null, apnstext: string, pushpayloadconst: string, jsonExtension: string): Promise<[NIMResCode, Array<RecallMsgNotify>]>;
+    /** 创建文本消息 */
+    createTextMessage(receiver_id: string, session_type: NIMSessionType, client_msg_id: string, content: string, msg_setting: MessageSetting, timetag: number, sub_type: number): IMMessage;
+    /** 创建文件消息 */
+    createFileMessage(receiver_id: string, session_type: NIMSessionType, client_msg_id: string, file: IMFile, file_path: string, msg_setting: MessageSetting, timetag: number, sub_type: number): IMMessage;
+    /** 创建图片消息 */
+    createImageMessage(receiver_id: string, session_type: NIMSessionType, client_msg_id: string, image: IMImage, file_path: string, msg_setting: MessageSetting, timetag: number, sub_type: number): IMMessage;
+    /** 创建语音消息 */
+    createAudioMessage(receiver_id: string, session_type: NIMSessionType, client_msg_id: string, audio: IMAudio, file_path: string, msg_setting: MessageSetting, timetag: number, sub_type: number): IMMessage;
+    /** 创建视频消息 */
+    createVideoMessage(receiver_id: string, session_type: NIMSessionType, client_msg_id: string, video: IMVideo, file_path: string, msg_setting: MessageSetting, timetag: number, sub_type: number): IMMessage;
+    /** 创建位置消息 */
+    createLocationMessage(receiver_id: string, session_type: NIMSessionType, client_msg_id: string, location: IMLocation, msg_setting: MessageSetting, timetag: number, sub_type: number): IMMessage;
+    /** 创建提醒消息 */
+    createTipMessage(receiver_id: string, session_type: NIMSessionType, client_msg_id: string, tip: string, msg_setting: MessageSetting, timetag: number, sub_type: number): IMMessage;
+    /** 创建转发消息 */
+    createRetweetMessage(sourceMessage: IMMessage, client_msg_id: string, session_type: NIMSessionType, receiver_id: string, msg_setting: MessageSetting, timetag: number): IMMessage;
     /** 从消息体中获取附件（图片、语音、视频等）的本地路径
      *  @param  msg	消息
      *  @return string	消息如果有附件，不管是否已下载，返回附件的本地路径；消息如果没有附件，返回空字符串。

package/types/nim_def/friend_def.d.ts CHANGED Viewed

@@ -34,17 +34,16 @@ export interface DeleteFriendOption {
 }
 /** @brief 云信好友 */
 export interface FriendProfile {
-    accid_?: string; /** < 用户账号 */
-    relationship_?: NIMFriendFlag; /** < 主动的好友关系 */
-    passive_relationship_?: NIMFriendFlag; /** < 被动的好友关系 */
-    source_?: NIMFriendSource; /** < 好友来源 */
-    alias_?: string; /** < 好友别名 */
-    bits_?: number; /** < 扩展数据 */
-    expand_?: string; /** < 扩展数据 */
-    value_available_flag_?: number; /** < 好友数据有效性，结合好友Key使用 */
-    server_expand_?: string; /** < 扩展数据 */
-    create_timetag_?: number; /** < 好友创建时间戳（毫秒） */
-    update_timetag_?: number; /** < 好友更新时间戳（毫秒） */
+    accid?: string; /** < 用户账号 */
+    flag?: NIMFriendFlag; /** < 主动的好友关系 */
+    beflag?: NIMFriendFlag; /** < 被动的好友关系 */
+    source?: NIMFriendSource; /** < 好友来源 */
+    alias?: string; /** < 好友别名 */
+    bits?: number; /** < 扩展数据 */
+    ex?: string; /** < 扩展数据 */
+    server_ex?: string; /** < 扩展数据 */
+    create_timetag?: number; /** < 好友创建时间戳（毫秒） */
+    update_timetag?: number; /** < 好友更新时间戳（毫秒） */
 }
 /** @brief 云信好友变更事件 */
 export interface FriendChangeEvent {

package/types/nim_def/talk_def.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { NIMResCode } from './client_def';
-import { IMMessage, NIMMessageFeature, NIMMessageType } from './msglog_def';
+import { IMMessage, NIMMessageFeature, NIMMessageType, MessageSetting } from './msglog_def';
 import { NIMSessionType } from './session_def';
 export interface SendMessageArc {
     talk_id_?: string; /**< 会话ID */
@@ -31,6 +31,50 @@ export interface RecallMsgNotify {
     attach_?: string; /**< v8.2.0 透传的附件信息 */
     callback_ext_?: string; /**< v8.2.0 第三方回调返回的字定义字段 */
 }
+export interface IMFile {
+    md5_?: string;
+    size_?: number;
+    url_?: string;
+    display_name_?: string;
+    file_extension_?: string;
+    msg_attachment_tag_?: string;
+}
+export interface IMImage {
+    md5?: string;
+    size?: number;
+    url_?: string;
+    name?: string;
+    ext?: string;
+    upload_tag?: string;
+    w?: number;
+    h?: number;
+}
+export interface IMAudio {
+    md5?: string;
+    size?: number;
+    url_?: string;
+    name?: string;
+    ext?: string;
+    upload_tag?: string;
+    dur?: number;
+}
+export interface IMVideo {
+    md5?: string;
+    size?: number;
+    url_?: string;
+    name?: string;
+    ext?: string;
+    upload_tag?: string;
+    w?: number;
+    h?: number;
+    dur?: number;
+}
+export interface IMLocation {
+    title?: string;
+    lat?: number;
+    lng?: number;
+}
+export type FileUpPrgCallback = (uplaodedSize: number, totalSize: number) => void;
 export type SendMsgAckCallback = (result: SendMessageArc) => void;
 export type ReceiveMsgCallback = (result: IMMessage) => void;
 export type ReceiveMsgsCallback = (result: Array<IMMessage>) => void;
@@ -41,11 +85,12 @@ export type TeamNotificationFilterCallback = (result: IMMessage) => boolean;
 export type MessageFilterCallback = (result: IMMessage) => boolean;
 export interface NIMTalkAPI {
     InitEventHandlers(): void;
-    SendMsg(msg: IMMessage, jsonExtension: string): void;
+    SendMsg(msg: IMMessage, jsonExtension: string, progressCb: FileUpPrgCallback): void;
     StopSendMsg(clientMsgId: string, type: NIMMessageType, jsonExtension: string): void;
     RecallMsg(msg: IMMessage, notify_msg: string, cb: RecallMsgsCallback | null, apnstext: string, pushpayloadconst: string, jsonExtension: string): void;
     GetAttachmentPathFromMsg(msg: IMMessage): string;
     ReplyMessage(msg: IMMessage, json_reply_msg: string): void;
     RegMessageFilter(cb: MessageFilterCallback | null, jsonExtension: string): void;
     RegTeamNotificationFilter(cb: TeamNotificationFilterCallback | null, jsonExtension: string): void;
+    CreateTextMessage(receiver_id: string, session_type: NIMSessionType, client_msg_id: string, content: string, msg_setting: MessageSetting, timetag: number, sub_type: number): string;
 }

package/types/nim_def/user_def.d.ts CHANGED Viewed

@@ -23,17 +23,17 @@ export interface BlackMuteListInfo {
     update_timetag_?: number; /**< 档案更新时间（毫秒） */
 }
 export interface UserNameCard {
-    accid_?: string; /**< 用户ID */
-    nickname_?: string; /**< 用户昵称 */
-    icon_url_?: string; /**< 用户头像下载地址 */
-    signature_?: string; /**< 用户签名 */
-    gender_?: number; /**< 用户性别 */
-    email_?: string; /**< 用户邮箱 */
-    birth_?: string; /**< 用户生日 */
-    mobile_?: string; /**< 用户电话 */
-    expand_?: string; /**< 用户扩展数据 */
-    create_timetag_?: number; /**< 用户档案创建时间戳(毫秒) */
-    update_timetag_?: number; /**< 用户档案更新时间戳(毫秒) */
+    accid?: string; /**< 用户ID */
+    name?: string; /**< 用户昵称 */
+    icon?: string; /**< 用户头像下载地址 */
+    sign?: string; /**< 用户签名 */
+    gender?: number; /**< 用户性别 */
+    email?: string; /**< 用户邮箱 */
+    birth?: string; /**< 用户生日 */
+    mobile?: string; /**< 用户电话 */
+    ex?: string; /**< 用户扩展数据 */
+    create_timetag?: number; /**< 用户档案创建时间戳(毫秒) */
+    update_timetag?: number; /**< 用户档案更新时间戳(毫秒) */
 }
 export interface SpecialRelationshipChangeEvent {
     type_?: NIMUserSpecialRelationshipChangeType; /**< 黑名单/静音名单更新事件类型 */