Compare commits
No commits in common. 'master' and 'v0.1.3' have entirely different histories.
@ -1,108 +0,0 @@
|
|||||||
name: CI
|
|
||||||
|
|
||||||
env:
|
|
||||||
NODE_OPTIONS: --max-old-space-size=6144
|
|
||||||
# install playwright binary manually (because pnpm only runs install script once)
|
|
||||||
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1"
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
- master
|
|
||||||
- release/*
|
|
||||||
- feat/*
|
|
||||||
- fix/*
|
|
||||||
- perf/*
|
|
||||||
- v1
|
|
||||||
- v2
|
|
||||||
pull_request:
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-${{ github.event.number || github.sha }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
timeout-minutes: 20
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
os: [ubuntu-latest]
|
|
||||||
node_version: [16]
|
|
||||||
fail-fast: false
|
|
||||||
|
|
||||||
name: "Build&Test: node-${{ matrix.node_version }}, ${{ matrix.os }}"
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Install pnpm
|
|
||||||
uses: pnpm/action-setup@v2.2.2
|
|
||||||
|
|
||||||
- name: Set node version to ${{ matrix.node_version }}
|
|
||||||
uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: ${{ matrix.node_version }}
|
|
||||||
cache: "pnpm"
|
|
||||||
|
|
||||||
- name: Install deps
|
|
||||||
run: pnpm install
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: pnpm run build
|
|
||||||
|
|
||||||
test:
|
|
||||||
timeout-minutes: 10
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
name: "Lint: node-16, ubuntu-latest"
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Install pnpm
|
|
||||||
uses: pnpm/action-setup@v2.2.2
|
|
||||||
|
|
||||||
- name: Set node version to 16
|
|
||||||
uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
cache: "pnpm"
|
|
||||||
|
|
||||||
- name: Install deps
|
|
||||||
run: pnpm install
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: pnpm run build
|
|
||||||
|
|
||||||
- name: Test
|
|
||||||
run: pnpm run test
|
|
||||||
|
|
||||||
lint:
|
|
||||||
timeout-minutes: 10
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
name: "Lint: node-16, ubuntu-latest"
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Install pnpm
|
|
||||||
uses: pnpm/action-setup@v2.2.2
|
|
||||||
|
|
||||||
- name: Set node version to 16
|
|
||||||
uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
cache: "pnpm"
|
|
||||||
|
|
||||||
- name: Install deps
|
|
||||||
run: pnpm install
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: pnpm run build
|
|
||||||
|
|
||||||
- name: Check formatting
|
|
||||||
run: pnpm run prettier
|
|
||||||
@ -1,3 +1 @@
|
|||||||
shamefully-hoist=true
|
package-lock=false
|
||||||
strict-peer-dependencies=true
|
|
||||||
auto-install-peers=true
|
|
||||||
|
|||||||
@ -1,26 +0,0 @@
|
|||||||
import QrcodeDecoder from '../';
|
|
||||||
|
|
||||||
describe('QrcodeDecoder', () => {
|
|
||||||
test('use', async () => {
|
|
||||||
const res = await import('../dist');
|
|
||||||
|
|
||||||
expect(res.default).toEqual(QrcodeDecoder);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('new QrcodeDecoder()', async () => {
|
|
||||||
const qr = new QrcodeDecoder();
|
|
||||||
|
|
||||||
expect(qr).toBeDefined();
|
|
||||||
expect(qr.videoConstraints).toEqual({
|
|
||||||
video: {
|
|
||||||
width: { min: 360, ideal: 720, max: 1080 },
|
|
||||||
height: { min: 360, ideal: 720, max: 1080 },
|
|
||||||
facingMode: { exact: 'environment' },
|
|
||||||
},
|
|
||||||
audio: false,
|
|
||||||
});
|
|
||||||
expect(qr.decodeFromImage).toBeDefined();
|
|
||||||
expect(qr.decodeFromCamera).toBeDefined();
|
|
||||||
expect(qr.decodeFromVideo).toBeDefined();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@ -1,54 +1,45 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
||||||
|
<title>QrcodeDecoder - Camera</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<button id="start">Start</button> <button id="stop">Stop</button><br />
|
||||||
|
<span id="result">Click start to scan qrcode.</span><br />
|
||||||
|
<hr />
|
||||||
|
<video id="video" autoplay></video>
|
||||||
|
|
||||||
<head>
|
<script src="./lib/vconsole.min.js"></script>
|
||||||
<meta charset="UTF-8" />
|
<script src="./index.min.js"></script>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<script type="text/javascript">
|
||||||
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
var vConsole = new VConsole();
|
||||||
<title>QrcodeDecoder - Camera</title>
|
console.log('Hello world');
|
||||||
</head>
|
function main() {
|
||||||
|
var qr = new QrcodeDecoder();
|
||||||
|
var video = document.querySelector('#video');
|
||||||
|
var start = document.querySelector('#start');
|
||||||
|
var stop = document.querySelector('#stop');
|
||||||
|
var result = document.querySelector('#result');
|
||||||
|
async function startScan() {
|
||||||
|
if (!qr.isCanvasSupported()) {
|
||||||
|
alert("Your browser doesn't match the required specs.");
|
||||||
|
throw new Error('Canvas and getUserMedia are required');
|
||||||
|
}
|
||||||
|
|
||||||
<body>
|
let code = await qr.decodeFromCamera(video);
|
||||||
<button id="start">Start</button> <button id="stop">Stop</button><br />
|
console.log('code', code);
|
||||||
<span id="result">Click start to scan qrcode.</span><br />
|
result.innerText = 'Result: ' + code.data;
|
||||||
<hr />
|
|
||||||
<video id="video" autoplay></video>
|
|
||||||
|
|
||||||
<script src="./lib/vconsole.min.js"></script>
|
|
||||||
<script src="./lib/index.min.js"></script>
|
|
||||||
<script type="text/javascript">
|
|
||||||
var vConsole = new VConsole();
|
|
||||||
console.log('Hello world');
|
|
||||||
function main() {
|
|
||||||
var qr = new QrcodeDecoder.default();
|
|
||||||
var video = document.querySelector('#video');
|
|
||||||
var start = document.querySelector('#start');
|
|
||||||
var stop = document.querySelector('#stop');
|
|
||||||
var result = document.querySelector('#result');
|
|
||||||
async function startScan() {
|
|
||||||
if (!qr.isCanvasSupported()) {
|
|
||||||
alert("Your browser doesn't match the required specs.");
|
|
||||||
throw new Error('Canvas and getUserMedia are required');
|
|
||||||
}
|
}
|
||||||
|
start.onclick = startScan;
|
||||||
|
|
||||||
let code = await qr.decodeFromCamera(video,
|
stop.onclick = function() {
|
||||||
// you can customize your camera size like below
|
qr.stop();
|
||||||
// {
|
};
|
||||||
// width: 400,
|
|
||||||
// height: 400,
|
|
||||||
// }
|
|
||||||
);
|
|
||||||
console.log('code', code);
|
|
||||||
result.innerText = 'Result: ' + code.data;
|
|
||||||
}
|
}
|
||||||
start.onclick = startScan;
|
main();
|
||||||
|
</script>
|
||||||
stop.onclick = function () {
|
</body>
|
||||||
qr.stop();
|
|
||||||
};
|
|
||||||
}
|
|
||||||
main();
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@ -1,66 +1,61 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
||||||
|
<title>QrcodeDecoder - Image</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<section>
|
||||||
|
<h3>Same domain image</h3>
|
||||||
|
<img src="./assets/qrcode.png" alt="qr code" /><br />
|
||||||
|
<button id="decode1">Decode!</button><br />
|
||||||
|
<span id="result1"></span><br />
|
||||||
|
</section>
|
||||||
|
<hr />
|
||||||
|
<section>
|
||||||
|
<h3>Different domain image</h3>
|
||||||
|
<button id="decode2">Decode!</button><br />
|
||||||
|
<span id="result2"></span><br />
|
||||||
|
</section>
|
||||||
|
<script src="./lib/vconsole.min.js"></script>
|
||||||
|
<script src="./index.min.js"></script>
|
||||||
|
<script src="./index.min.js"></script>
|
||||||
|
<script type="module">
|
||||||
|
var vConsole = new VConsole();
|
||||||
|
console.log('Hello world');
|
||||||
|
function main() {
|
||||||
|
var qr = new QrcodeDecoder();
|
||||||
|
|
||||||
<head>
|
var btn1 = document.querySelector('button#decode1');
|
||||||
<meta charset="UTF-8" />
|
var btn2 = document.querySelector('button#decode2');
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
var result1 = document.querySelector('#result1');
|
||||||
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
var result2 = document.querySelector('#result2');
|
||||||
<title>QrcodeDecoder - Image</title>
|
var img = document.querySelector('img');
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
btn1.onclick = async () => {
|
||||||
<section>
|
// you can also decode from image path
|
||||||
<h3>Same domain image</h3>
|
// const code = await qr.decodeFromImage('./assets/qrcode.png');
|
||||||
<img id="img1" src="./assets/qrcode.png" alt="qr code" /><br />
|
const code = await qr.decodeFromImage(img);
|
||||||
<button id="decode1">Decode!</button><br />
|
console.log(code);
|
||||||
<span id="result1"></span><br />
|
result1.innerText = code.data;
|
||||||
</section>
|
};
|
||||||
<hr />
|
|
||||||
<section>
|
|
||||||
<h3>Different domain image</h3>
|
|
||||||
<input
|
|
||||||
id="img2"
|
|
||||||
value="https://yugasun.com/static/wechat.jpg"
|
|
||||||
style="width: 400px" /><br />
|
|
||||||
<button id="decode2">Decode!</button><br />
|
|
||||||
<span id="result2"></span><br />
|
|
||||||
</section>
|
|
||||||
<script src="./lib/vconsole.min.js"></script>
|
|
||||||
<script src="./lib/index.min.js"></script>
|
|
||||||
<script type="module">
|
|
||||||
var vConsole = new VConsole();
|
|
||||||
function main() {
|
|
||||||
var qr = new QrcodeDecoder.default();
|
|
||||||
|
|
||||||
var btn1 = document.querySelector('button#decode1');
|
btn2.onclick = async () => {
|
||||||
var btn2 = document.querySelector('button#decode2');
|
// you can also decode from image path
|
||||||
var result1 = document.querySelector('#result1');
|
// const code = await qr.decodeFromImage('./assets/qrcode.png');
|
||||||
var result2 = document.querySelector('#result2');
|
const code = await qr.decodeFromImage(
|
||||||
var img1 = document.querySelector('#img1');
|
'https://yugasun.com/static/wechat.jpg',
|
||||||
var img2 = document.querySelector('#img2');
|
{
|
||||||
|
crossOrigin: 'anonymous',
|
||||||
btn1.onclick = async () => {
|
},
|
||||||
// you can also decode from image path
|
);
|
||||||
// const code = await qr.decodeFromImage('./assets/qrcode.png');
|
console.log(code);
|
||||||
const code = await qr.decodeFromImage(img1);
|
result2.innerText = code.data;
|
||||||
console.log(code);
|
};
|
||||||
result1.innerText = code.data;
|
}
|
||||||
};
|
|
||||||
|
|
||||||
btn2.onclick = async () => {
|
|
||||||
// you can also decode from image path
|
|
||||||
// const code = await qr.decodeFromImage('./assets/qrcode.png');
|
|
||||||
const code = await qr.decodeFromImage(img2.value, {
|
|
||||||
crossOrigin: 'anonymous',
|
|
||||||
});
|
|
||||||
console.log(code);
|
|
||||||
result2.innerText = code.data;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
window.onload = () => {
|
|
||||||
main();
|
main();
|
||||||
};
|
</script>
|
||||||
</script>
|
</body>
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -1,45 +1,43 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
||||||
|
<title>QrcodeDecoder - Video</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<button id="start">Start</button> <button id="stop">Stop</button><br />
|
||||||
|
<span id="result">Click start to scan qrcode.</span><br />
|
||||||
|
|
||||||
<head>
|
<video src="./assets/qrcode-video.mp4"></video>
|
||||||
<meta charset="UTF-8" />
|
<script src="./lib/vconsole.min.js"></script>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<script src="./index.min.js"></script>
|
||||||
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
|
<script type="text/javascript">
|
||||||
<title>QrcodeDecoder - Video</title>
|
var vConsole = new VConsole();
|
||||||
</head>
|
console.log('Hello world');
|
||||||
|
function main() {
|
||||||
|
var video = document.querySelector('video');
|
||||||
|
var result = document.querySelector('#result');
|
||||||
|
var start = document.querySelector('#start');
|
||||||
|
var stop = document.querySelector('#stop');
|
||||||
|
var qr = new QrcodeDecoder();
|
||||||
|
|
||||||
<body>
|
start.onclick = startScan;
|
||||||
<button id="start">Start</button> <button id="stop">Stop</button><br />
|
|
||||||
<span id="result">Click start to scan qrcode.</span><br />
|
|
||||||
|
|
||||||
<video src="./assets/qrcode-video.mp4"></video>
|
stop.onclick = function() {
|
||||||
<script src="./lib/vconsole.min.js"></script>
|
qr.stop();
|
||||||
<script src="./lib/index.min.js"></script>
|
video.pause();
|
||||||
<script type="text/javascript">
|
};
|
||||||
var vConsole = new VConsole();
|
|
||||||
function main() {
|
|
||||||
var video = document.querySelector('video');
|
|
||||||
var result = document.querySelector('#result');
|
|
||||||
var start = document.querySelector('#start');
|
|
||||||
var stop = document.querySelector('#stop');
|
|
||||||
var qr = new QrcodeDecoder.default();
|
|
||||||
|
|
||||||
start.onclick = startScan;
|
async function startScan() {
|
||||||
|
video.play();
|
||||||
stop.onclick = function () {
|
const code = await qr.decodeFromVideo(video);
|
||||||
qr.stop();
|
console.log('code', code);
|
||||||
video.pause();
|
result.innerText = 'Result: ' + code.data;
|
||||||
};
|
}
|
||||||
|
|
||||||
async function startScan() {
|
|
||||||
video.play();
|
|
||||||
const code = await qr.decodeFromVideo(video);
|
|
||||||
console.log('code', code);
|
|
||||||
result.innerText = 'Result: ' + code.data;
|
|
||||||
}
|
}
|
||||||
}
|
main();
|
||||||
main();
|
</script>
|
||||||
</script>
|
</body>
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,24 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"rootDir": "src",
|
||||||
|
"outDir": "dist",
|
||||||
|
"baseUrl": ".",
|
||||||
|
"downlevelIteration": true,
|
||||||
|
"emitDecoratorMetadata": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"preserveConstEnums": true,
|
||||||
|
"importHelpers": false,
|
||||||
|
"target": "es5",
|
||||||
|
"module": "commonjs",
|
||||||
|
"lib": ["es5", "es6", "dom"],
|
||||||
|
"moduleResolution": "node",
|
||||||
|
"sourceMap": false,
|
||||||
|
"paths": {
|
||||||
|
"*": ["typings/*", "includes/*"]
|
||||||
|
},
|
||||||
|
"resolveJsonModule": true,
|
||||||
|
"noUnusedLocals": true,
|
||||||
|
"strict": true
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue