update dependency

This commit is contained in:
Sorunome 2020-04-01 18:35:57 +02:00
parent eb63cf4cdf
commit c777235aad
No known key found for this signature in database
GPG Key ID: B19471D07FC9BE9C
4 changed files with 39 additions and 41 deletions

71
package-lock.json generated
View File

@ -34,13 +34,6 @@
"requires": { "requires": {
"@types/connect": "*", "@types/connect": "*",
"@types/node": "*" "@types/node": "*"
},
"dependencies": {
"@types/node": {
"version": "13.9.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz",
"integrity": "sha512-01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA=="
}
} }
}, },
"@types/bson": { "@types/bson": {
@ -75,13 +68,6 @@
"integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==",
"requires": { "requires": {
"@types/node": "*" "@types/node": "*"
},
"dependencies": {
"@types/node": {
"version": "13.9.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz",
"integrity": "sha512-01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA=="
}
} }
}, },
"@types/escape-html": { "@types/escape-html": {
@ -100,12 +86,13 @@
"integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==" "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg=="
}, },
"@types/express": { "@types/express": {
"version": "4.17.3", "version": "4.17.4",
"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.4.tgz",
"integrity": "sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==", "integrity": "sha512-DO1L53rGqIDUEvOjJKmbMEQ5Z+BM2cIEPy/eV3En+s166Gz+FeuzRerxcab757u/U4v4XF4RYrZPmqKa+aY/2w==",
"requires": { "requires": {
"@types/body-parser": "*", "@types/body-parser": "*",
"@types/express-serve-static-core": "*", "@types/express-serve-static-core": "*",
"@types/qs": "*",
"@types/serve-static": "*" "@types/serve-static": "*"
} }
}, },
@ -116,13 +103,6 @@
"requires": { "requires": {
"@types/node": "*", "@types/node": "*",
"@types/range-parser": "*" "@types/range-parser": "*"
},
"dependencies": {
"@types/node": {
"version": "13.9.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz",
"integrity": "sha512-01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA=="
}
} }
}, },
"@types/form-data": { "@types/form-data": {
@ -193,6 +173,11 @@
"resolved": "https://registry.npmjs.org/@types/object-inspect/-/object-inspect-1.6.1.tgz", "resolved": "https://registry.npmjs.org/@types/object-inspect/-/object-inspect-1.6.1.tgz",
"integrity": "sha512-i+IgNcDl9bt2z9kwUdwNJQ4aVdZ9jVhjTCfH/YU2amkZIaHFPGSwpfarBzEOY0Pc5eGsei53CO0SiBn27vj1VA==" "integrity": "sha512-i+IgNcDl9bt2z9kwUdwNJQ4aVdZ9jVhjTCfH/YU2amkZIaHFPGSwpfarBzEOY0Pc5eGsei53CO0SiBn27vj1VA=="
}, },
"@types/qs": {
"version": "6.9.1",
"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.1.tgz",
"integrity": "sha512-lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw=="
},
"@types/range-parser": { "@types/range-parser": {
"version": "1.2.3", "version": "1.2.3",
"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
@ -1219,6 +1204,11 @@
"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==" "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
}, },
"expire-set": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/expire-set/-/expire-set-1.0.0.tgz",
"integrity": "sha512-wOQlqatf2sJtOabNk3gEPbGvo/C8tIUhzT3rz08+i7X+u1NV+UNY4p3Lzq8DxrW57mBML1Fp5qNeYt70Qnndpg=="
},
"express": { "express": {
"version": "4.17.1", "version": "4.17.1",
"resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
@ -2586,9 +2576,8 @@
} }
}, },
"matrix-bot-sdk": { "matrix-bot-sdk": {
"version": "0.5.3", "version": "git+https://github.com/Sorunome/matrix-js-bot-sdk.git#8259b9e470469b243666f420e6cf972758694bbb",
"resolved": "https://registry.npmjs.org/matrix-bot-sdk/-/matrix-bot-sdk-0.5.3.tgz", "from": "git+https://github.com/Sorunome/matrix-js-bot-sdk.git#8259b9e470469b243666f420e6cf972758694bbb",
"integrity": "sha512-jmoU55HbJpvTopZrjMca5u7jmfW3j/Fc3vPExs+5RRqFNCChT/TYQxr7PXD9Ho96YbL7zJ3zynOZ3fXvHg4hYA==",
"requires": { "requires": {
"@types/express": "^4.17.2", "@types/express": "^4.17.2",
"chalk": "^3.0.0", "chalk": "^3.0.0",
@ -2776,6 +2765,11 @@
"minimist": "^1.2.5" "minimist": "^1.2.5"
} }
}, },
"mkdirp-classic": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz",
"integrity": "sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g=="
},
"moment": { "moment": {
"version": "2.24.0", "version": "2.24.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
@ -2806,17 +2800,18 @@
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
}, },
"mx-puppet-bridge": { "mx-puppet-bridge": {
"version": "0.0.35-1", "version": "0.0.35-5",
"resolved": "https://registry.npmjs.org/mx-puppet-bridge/-/mx-puppet-bridge-0.0.35-1.tgz", "resolved": "https://registry.npmjs.org/mx-puppet-bridge/-/mx-puppet-bridge-0.0.35-5.tgz",
"integrity": "sha512-1+S5iAM+idvPJ2zPXG9RZPFo78zgri7M7wHEK2Y5aacWDvLyaOiL6KmlOfNS5FJwo7Qca0Dx02M0gf5NN3VRzw==", "integrity": "sha512-F6SSEXhEWKJIQnNxnUXuWhZ/+pmy3TCVzQ+GtZOQfRjzLe+Uf/G+5D9q3jcM/gMWTVN7Pbhu8rqwmIahmZOInA==",
"requires": { "requires": {
"better-sqlite3": "^6.0.1", "better-sqlite3": "^6.0.1",
"events": "^3.1.0", "events": "^3.1.0",
"expire-set": "^1.0.0",
"file-type": "^12.4.2", "file-type": "^12.4.2",
"hasha": "^5.2.0", "hasha": "^5.2.0",
"js-yaml": "^3.13.1", "js-yaml": "^3.13.1",
"markdown-it": "^9.1.0", "markdown-it": "^9.1.0",
"matrix-bot-sdk": "^0.5.3", "matrix-bot-sdk": "git+https://github.com/Sorunome/matrix-js-bot-sdk.git#8259b9e470469b243666f420e6cf972758694bbb",
"pg-promise": "^8.7.5", "pg-promise": "^8.7.5",
"request": "^2.88.2", "request": "^2.88.2",
"request-promise": "^4.2.5", "request-promise": "^4.2.5",
@ -3591,9 +3586,9 @@
"integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
}, },
"signal-exit": { "signal-exit": {
"version": "3.0.2", "version": "3.0.3",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
}, },
"simple-concat": { "simple-concat": {
"version": "1.0.0", "version": "1.0.0",
@ -3936,12 +3931,12 @@
} }
}, },
"tar-fs": { "tar-fs": {
"version": "2.0.0", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz",
"integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==", "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==",
"requires": { "requires": {
"chownr": "^1.1.1", "chownr": "^1.1.1",
"mkdirp": "^0.5.1", "mkdirp-classic": "^0.5.2",
"pump": "^3.0.0", "pump": "^3.0.0",
"tar-stream": "^2.0.0" "tar-stream": "^2.0.0"
} }

View File

@ -17,8 +17,9 @@
"decode-html": "^2.0.0", "decode-html": "^2.0.0",
"escape-html": "^1.0.3", "escape-html": "^1.0.3",
"events": "^3.0.0", "events": "^3.0.0",
"expire-set": "^1.0.0",
"js-yaml": "^3.13.1", "js-yaml": "^3.13.1",
"mx-puppet-bridge": "0.0.35-1", "mx-puppet-bridge": "0.0.35-5",
"node-emoji": "^1.10.0", "node-emoji": "^1.10.0",
"node-html-parser": "^1.2.13", "node-html-parser": "^1.2.13",
"skype-http": "git://github.com/Sorunome/skype-http#8f1c71e7654ac5e04c31c552eff847f4ff63b8fa", "skype-http": "git://github.com/Sorunome/skype-http#8f1c71e7654ac5e04c31c552eff847f4ff63b8fa",

View File

@ -11,12 +11,13 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import { Log, ExpireSet, IRemoteRoom, Util } from "mx-puppet-bridge"; import { Log, IRemoteRoom, Util } from "mx-puppet-bridge";
import { EventEmitter } from "events"; import { EventEmitter } from "events";
import * as skypeHttp from "skype-http"; import * as skypeHttp from "skype-http";
import { Contact as SkypeContact } from "skype-http/dist/lib/types/contact"; import { Contact as SkypeContact } from "skype-http/dist/lib/types/contact";
import { NewMediaMessage as SkypeNewMediaMessage } from "skype-http/dist/lib/interfaces/api/api"; import { NewMediaMessage as SkypeNewMediaMessage } from "skype-http/dist/lib/interfaces/api/api";
import { Context as SkypeContext } from "skype-http/dist/lib/interfaces/api/context"; import { Context as SkypeContext } from "skype-http/dist/lib/interfaces/api/context";
import ExpireSet from "expire-set";
const log = new Log("SkypePuppet:client"); const log = new Log("SkypePuppet:client");

View File

@ -13,7 +13,7 @@ limitations under the License.
import { import {
PuppetBridge, IRemoteUser, IRemoteRoom, IReceiveParams, IMessageEvent, IFileEvent, Log, MessageDeduplicator, Util, PuppetBridge, IRemoteUser, IRemoteRoom, IReceiveParams, IMessageEvent, IFileEvent, Log, MessageDeduplicator, Util,
ExpireSet, IRetList, IRetList,
} from "mx-puppet-bridge"; } from "mx-puppet-bridge";
import { Client } from "./client"; import { Client } from "./client";
import * as skypeHttp from "skype-http"; import * as skypeHttp from "skype-http";
@ -25,6 +25,7 @@ import * as escapeHtml from "escape-html";
import { MatrixMessageParser } from "./matrixmessageparser"; import { MatrixMessageParser } from "./matrixmessageparser";
import { SkypeMessageParser } from "./skypemessageparser"; import { SkypeMessageParser } from "./skypemessageparser";
import * as cheerio from "cheerio"; import * as cheerio from "cheerio";
import ExpireSet from "expire-set";
const log = new Log("SkypePuppet:skype"); const log = new Log("SkypePuppet:skype");