GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/GeneralBots/BotServer

Browse source
This commit is contained in:
Rodrigo Rodriguez 2023-03-03 19:10:34 -03:00
commit 025cf0c988
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -11,7 +11,8 @@
"João Ferreira <joao.parana@gmail.com>", "João Ferreira <joao.parana@gmail.com>",
"Jorge Ramos <jramos@pobox.com>", "Jorge Ramos <jramos@pobox.com>",
"PH <ph.an@outlook.com>", "PH <ph.an@outlook.com>",
"Dário Vieira <dario.junior3@gmail.com>" "Dário Vieira <dario.junior3@gmail.com>",
"Alan Perdomo <alanperdomo@hotmail.com>"
], ],
"engines": { "engines": {
"node": "=19.7.0" "node": "=19.7.0"
@ -140,6 +141,7 @@
"puppeteer-extra": "3.3.4", "puppeteer-extra": "3.3.4",
"puppeteer-extra-plugin-stealth": "2.11.1", "puppeteer-extra-plugin-stealth": "2.11.1",
"qrcode": "1.5.1", "qrcode": "1.5.1",
"qr-scanner": "^1.4.2",
"qrcode-terminal": "0.12.0", "qrcode-terminal": "0.12.0",
"readline": "1.3.0", "readline": "1.3.0",
"reflect-metadata": "0.1.13", "reflect-metadata": "0.1.13",

8
packages/basic.gblib/services/DialogKeywords.ts
View file

@ -59,6 +59,7 @@ import qrcode from 'qrcode';
import { json } from 'body-parser'; import { json } from 'body-parser';
import { WebAutomationServices } from './WebAutomationServices.js'; import { WebAutomationServices } from './WebAutomationServices.js';
import urljoin from 'url-join'; import urljoin from 'url-join';
import QrScanner from 'qr-scanner';
/** /**
* Default check interval for user replay * Default check interval for user replay
@ -1001,6 +1002,13 @@ export class DialogKeywords {
} }
result = phoneNumber; result = phoneNumber;
} else if (kind === 'qr-scanner'){
//https://github.com/GeneralBots/BotServer/issues/171
GBLog.info(`BASIC (${min.botId}): Upload done for ${answer.filename}.`);
const handle = WebAutomationServices.cyrb53(this.min.botId + answer.filename);
GBServer.globals.files[handle] = answer;
QrScanner.scanImage(GBServer.globals.files[handle]).then(result => console.log(result)).catch(error => console.log(error || 'no QR code found.'));
} else if (kind === 'zipcode') { } else if (kind === 'zipcode') {
const extractEntity = (text: string) => { const extractEntity = (text: string) => {
text = text.replace(/\-/gi, ''); text = text.replace(/\-/gi, '');

7
packages/basic.gblib/services/KeywordsExpressions.ts
View file

@ -247,6 +247,13 @@ export class KeywordsExpressions {
} }
]; ];
keywords[i++] = [
/^\s*hear (\w+) as\s*qrcode/gim,
($0, $1) => {
return `${$1} = await dk.getHear({pid: pid, kind:"qrcode")}`;
}
];
keywords[i++] = [ keywords[i++] = [
/^\s*hear (\w+) as\s*language/gim, /^\s*hear (\w+) as\s*language/gim,
($0, $1) => { ($0, $1) => {