@things-factory/reference-app 4.0.11 → 4.0.16

package/client/components/camera-capturer.js

@@ -1,4 +1,4 @@
-import { LitElement, css, html } from 'lit-element'
+import { css, html, LitElement } from 'lit-element'
 
 import { FileDropHelper } from '@things-factory/utils'
 
@@ -90,7 +90,7 @@ export class CameraCapturer extends LitElement {
         accept=${this.accept}
         ?multiple=${this.multiple}
         hidden
-        capture="camera"
+        capture="environment"
         @change=${e => {
           const fileInput = e.currentTarget
 

package/client/components/ocr-viewpart.js

@@ -55,6 +55,30 @@ class OCRViewPart extends LitElement {
     `
   }
 
+  extractInfosResultParser(response) {
+    const ocrResult = response.ocr?.result || []
+    const barcodeResult = response.barcode?.result || []
+    // const results = ocrResult.concat(barcodeResult)
+    if (ocrResult.length != barcodeResult.length) {
+      console.warn('ocr and barcode result size are different. It could be loss of information.')
+    }
+    const resultSize = Math.min(ocrResult.length, barcodeResult.length)
+
+    let results = []
+    for (let i = 0; i < resultSize; i++) {
+      try {
+        let boundaries = JSON.parse(ocrResult[i].boundaries)
+        boundaries = boundaries.concat(JSON.parse(barcodeResult[i].boundaries))
+        let texts = ocrResult[i].texts.concat(barcodeResult[i].texts)
+        results.push({ boundaries, texts })
+      } catch(err) {
+        console.error(err)
+      }
+    }
+
+    return results
+  }
+
   async upload(e) {
     FILES = this._files = e.detail
 
@@ -72,12 +96,8 @@ class OCRViewPart extends LitElement {
 
     if (!response.errors) {
       const helper = this.shadowRoot.querySelector('ox-ocr-helper')
-      RESULT = helper.result = response.data.ocrRequest.map(result => {
-        return {
-          ...result,
-          boundaries: JSON.parse(result.boundaries)
-        }
-      })
+      helper.result = this.extractInfosResultParser(response.data.ocrRequest)
+      // console.log('helper.result', helper.result)
     } else {
       document.dispatchEvent(
         new CustomEvent('notify', {

package/client/pages/grist-mode-page.js

@@ -2,8 +2,8 @@ import '@operato/popup'
 import '@operato/data-grist'
 
 import { css, html } from 'lit-element'
-
 import { i18next, localize } from '@things-factory/i18n-base'
+
 import { PageView } from '@things-factory/shell'
 
 class GristModePage extends localize(i18next)(PageView) {

package/client/pages/label-scan-page.js

@@ -1,10 +1,10 @@
 import '@things-factory/barcode-ui'
-
-import { css, html } from 'lit-element'
-import { connect } from 'pwa-helpers/connect-mixin.js'
+import '@operato/input/dist/src/ox-input-barcode.js'
 
 import { PageView, store } from '@things-factory/shell'
+import { css, html } from 'lit-element'
 
+import { connect } from 'pwa-helpers/connect-mixin.js'
 import { referencePageStyles } from './reference-page-styles'
 
 class LabelScanPage extends connect(store)(PageView) {
@@ -51,10 +51,8 @@ class LabelScanPage extends connect(store)(PageView) {
     return html`
       <section>
         <h2>Barcode Scanable Input</h2>
-        <p>
-          barcode-scanable-input 컴포넌트는 카메라 입력을 통해서 바코드를 스캔하고, 스캔한 결과를 입력 필드에 적용한다.
-        </p>
-        <barcode-scanable-input
+        <p>ox-input-barcode 컴포넌트는 카메라 입력을 통해서 바코드를 스캔하고, 스캔한 결과를 입력 필드에 적용한다.</p>
+        <ox-input-barcode
           name="barcode-input"
           custom-input
           @keypress=${e => {
@@ -64,7 +62,7 @@ class LabelScanPage extends connect(store)(PageView) {
               console.log('input completed.', e.target.value)
             }
           }}
-        ></barcode-scanable-input>
+        ></ox-input-barcode>
       </section>
 
       <section>

package/dist-server/service/reference/lambda-call.js

@@ -3,25 +3,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.interpretImages = void 0;
+exports.extractInfos = void 0;
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const env_1 = require("@things-factory/env");
 const utils_1 = require("@things-factory/utils");
 const appSyncConfig = env_1.config.get('awsAppSync');
-async function interpretImages(images) {
+async function extractInfos(images) {
+    const extraction = {
+        success_count: true,
+        failure_count: true,
+        result: {
+            boundaries: true,
+            texts: true
+        }
+    };
     const query = utils_1.gqlBuilder.jsonToGraphQLQuery({
         mutation: {
-            upload: {
+            extractInfos: {
                 __args: {
                     images
                 },
-                success_count: true,
-                failure_count: true,
-                result: {
-                    key_values: true,
-                    boundaries: true,
-                    texts: true
-                }
+                ocr: extraction,
+                barcode: extraction
             }
         }
     });
@@ -37,7 +40,7 @@ async function interpretImages(images) {
     const jsonRes = await response.json();
     return jsonRes;
 }
-exports.interpretImages = interpretImages;
+exports.extractInfos = extractInfos;
 // @deprecated
 function getRequestBody(images) {
     // @things-factory/utils gqlBuilder.buildArgs 와 유사
@@ -56,7 +59,6 @@ function getRequestBody(images) {
         success_count
         failure_count
         results {
-          key_values
           boundaries
           texts
         } 

package/dist-server/service/reference/lambda-call.js.map

@@ -1 +1 @@
-{"version":3,"file":"lambda-call.js","sourceRoot":"","sources":["../../../server/service/reference/lambda-call.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA8B;AAE9B,6CAA4C;AAC5C,iDAAkD;AAElD,MAAM,aAAa,GAAG,YAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;AAEvC,KAAK,UAAU,eAAe,CAAC,MAAM;IAC1C,MAAM,KAAK,GAAG,kBAAU,CAAC,kBAAkB,CAAC;QAC1C,QAAQ,EAAE;YACR,MAAM,EAAE;gBACN,MAAM,EAAE;oBACN,MAAM;iBACP;gBACD,aAAa,EAAE,IAAI;gBACnB,aAAa,EAAE,IAAI;gBACnB,MAAM,EAAE;oBACN,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE,IAAI;oBAChB,KAAK,EAAE,IAAI;iBACZ;aACF;SACF;KACF,CAAC,CAAA;IAEF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IACtC,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;QACpD,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,qBAAqB;YACrC,WAAW,EAAE,aAAa,CAAC,QAAQ,CAAC;SACrC;QACD,IAAI;KACL,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IACrC,OAAO,OAAO,CAAA;AAChB,CAAC;AA9BD,0CA8BC;AAED,cAAc;AACd,SAAS,cAAc,CAAC,MAAM;IAC5B,kDAAkD;IAClD,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACjC,MAAM,IAAI,GAAG,EAAE,CAAA;QACf,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE;YACnB,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;SACrC;QACD,OAAO,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAA;IACnC,CAAC,CAAC,CAAA;IAEF,4CAA4C;IAC5C,yBAAyB;IAEzB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;QAC1B,KAAK,EAAE;uBACY,SAAS;;;;;;;;;MAS1B;KACH,CAAC,CAAA;IAEF,OAAO,IAAI,CAAA;AACb,CAAC"}
+{"version":3,"file":"lambda-call.js","sourceRoot":"","sources":["../../../server/service/reference/lambda-call.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA8B;AAE9B,6CAA4C;AAC5C,iDAAkD;AAElD,MAAM,aAAa,GAAG,YAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;AAEvC,KAAK,UAAU,YAAY,CAAC,MAAM;IACvC,MAAM,UAAU,GAAG;QACjB,aAAa,EAAE,IAAI;QACnB,aAAa,EAAE,IAAI;QACnB,MAAM,EAAE;YACN,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,IAAI;SACZ;KACF,CAAA;IACD,MAAM,KAAK,GAAG,kBAAU,CAAC,kBAAkB,CAAC;QAC1C,QAAQ,EAAE;YACR,YAAY,EAAE;gBACZ,MAAM,EAAE;oBACN,MAAM;iBACP;gBACD,GAAG,EAAE,UAAU;gBACf,OAAO,EAAE,UAAU;aACpB;SACF;KACF,CAAC,CAAA;IAEF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IACtC,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;QACpD,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,qBAAqB;YACrC,WAAW,EAAE,aAAa,CAAC,QAAQ,CAAC;SACrC;QACD,IAAI;KACL,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IACrC,OAAO,OAAO,CAAA;AAChB,CAAC;AAjCD,oCAiCC;AAED,cAAc;AACd,SAAS,cAAc,CAAC,MAAM;IAC5B,kDAAkD;IAClD,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACjC,MAAM,IAAI,GAAG,EAAE,CAAA;QACf,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE;YACnB,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;SACrC;QACD,OAAO,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAA;IACnC,CAAC,CAAC,CAAA;IAEF,4CAA4C;IAC5C,yBAAyB;IAEzB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;QAC1B,KAAK,EAAE;uBACY,SAAS;;;;;;;;MAQ1B;KACH,CAAC,CAAA;IAEF,OAAO,IAAI,CAAA;AACb,CAAC"}

package/dist-server/service/reference/reference-query.js

@@ -22,7 +22,7 @@ const lambda_call_1 = require("./lambda-call");
 const debug = require('debug')('things-factory:reference-app');
 let ReferenceQuery = class ReferenceQuery {
     async ocrRequest(_, images, context) {
-        var _a, _b;
+        var _a;
         const { domain, user, tx } = context.state;
         const all = Promise.all(images);
         if ((images === null || images === void 0 ? void 0 : images.length) > 0) {
@@ -42,9 +42,9 @@ let ReferenceQuery = class ReferenceQuery {
                 const formatArr = mimetype.split('/');
                 return { data: image, name: filename, format: formatArr[formatArr.length - 1] };
             }));
-            const res = await (0, lambda_call_1.interpretImages)(files);
+            const res = await (0, lambda_call_1.extractInfos)(files);
             console.log('interpretImages response', JSON.stringify(res, null, ' '));
-            return (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.upload) === null || _b === void 0 ? void 0 : _b.result;
+            return (_a = res.data) === null || _a === void 0 ? void 0 : _a.extractInfos;
         }
         return [];
     }

package/dist-server/service/reference/reference-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"reference-query.js","sourceRoot":"","sources":["../../../server/service/reference/reference-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mDAA0D;AAC1D,+CAA8D;AAE9D,qEAA+E;AAC/E,iDAAkE;AAClE,iDAA6C;AAE7C,+CAA+C;AAE/C,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,8BAA8B,CAAC,CAAA;AAG9D,IAAa,cAAc,GAA3B,MAAa,cAAc;IAEzB,KAAK,CAAC,UAAU,CACN,CAAC,EAET,MAAoB,EACb,OAAY;;QAEnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAC1C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAE/B,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,IAAG,CAAC,EAAE;YACtB,MAAM,WAAW,GAAiB,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBACxD,OAAO;oBACL,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE,GAAG;oBACV,QAAQ,EAAE,WAAW;iBACtB,CAAA;YACH,CAAC,CAAC,CAAA;YACF,MAAM,IAAA,mCAAiB,EAAC,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC,CAAA;YAEpD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;gBACtB,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAA;gBAC3D,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAA;gBACrC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;gBACnD,yBAAyB;gBACzB,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBACrC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAA;YACjF,CAAC,CAAC,CACH,CAAA;YACD,MAAM,GAAG,GAAG,MAAM,IAAA,6BAAe,EAAC,KAAK,CAAC,CAAA;YACxC,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAA;YACvE,OAAO,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,MAAM,0CAAE,MAAM,CAAA;SAChC;QAED,OAAO,EAAE,CAAA;IACX,CAAC;IAED,cAAc,CAAE,MAAM;QACpB,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC9D,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACzC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAA;IACJ,CAAC;IAGD,KAAK,CAAC,aAAa,CAAS,CAAC,EAAc,GAAW,EAAS,OAAY;QACzE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE;YAC7B,MAAM,IAAA,aAAK,EAAC,GAAG,CAAC,CAAA;YAEhB,IAAA,uBAAe,EAAC;gBACd,MAAM;gBACN,GAAG;gBACH,QAAQ,EAAE,CAAC;gBACX,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE,SAAS;aAC5B,CAAC,CAAA;SACH;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;CACF,CAAA;AA/DC;IADC,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,iBAAS,EAAE,EAAE,WAAW,EAAE,6BAA6B,EAAE,CAAC;IAEzE,WAAA,IAAA,mBAAI,GAAE,CAAA;IACN,WAAA,IAAA,kBAAG,EAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,8BAAa,CAAC,CAAC,CAAA;IAEpC,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;gDA+BP;AAYD;IADC,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,sCAAsC,EAAE,CAAC;IAC7D,WAAA,IAAA,mBAAI,GAAE,CAAA;IAAK,WAAA,IAAA,kBAAG,EAAC,KAAK,CAAC,CAAA;IAAe,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;mDAe7D;AAhEU,cAAc;IAD1B,IAAA,uBAAQ,GAAE;GACE,cAAc,CAiE1B;AAjEY,wCAAc"}
+{"version":3,"file":"reference-query.js","sourceRoot":"","sources":["../../../server/service/reference/reference-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mDAA0D;AAC1D,+CAA8D;AAE9D,qEAA+E;AAC/E,iDAAkE;AAClE,iDAA6C;AAE7C,+CAA4C;AAE5C,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,8BAA8B,CAAC,CAAA;AAG9D,IAAa,cAAc,GAA3B,MAAa,cAAc;IAEzB,KAAK,CAAC,UAAU,CACN,CAAC,EAET,MAAoB,EACb,OAAY;;QAEnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAC1C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAE/B,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,IAAG,CAAC,EAAE;YACtB,MAAM,WAAW,GAAiB,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBACxD,OAAO;oBACL,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE,GAAG;oBACV,QAAQ,EAAE,WAAW;iBACtB,CAAA;YACH,CAAC,CAAC,CAAA;YACF,MAAM,IAAA,mCAAiB,EAAC,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC,CAAA;YAEpD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;gBACtB,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAA;gBAC3D,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAA;gBACrC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;gBACnD,yBAAyB;gBACzB,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBACrC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAA;YACjF,CAAC,CAAC,CACH,CAAA;YACD,MAAM,GAAG,GAAG,MAAM,IAAA,0BAAY,EAAC,KAAK,CAAC,CAAA;YACrC,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAA;YACvE,OAAO,MAAA,GAAG,CAAC,IAAI,0CAAE,YAAY,CAAA;SAC9B;QAED,OAAO,EAAE,CAAA;IACX,CAAC;IAED,cAAc,CAAE,MAAM;QACpB,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC9D,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACzC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAA;IACJ,CAAC;IAGD,KAAK,CAAC,aAAa,CAAS,CAAC,EAAc,GAAW,EAAS,OAAY;QACzE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE;YAC7B,MAAM,IAAA,aAAK,EAAC,GAAG,CAAC,CAAA;YAEhB,IAAA,uBAAe,EAAC;gBACd,MAAM;gBACN,GAAG;gBACH,QAAQ,EAAE,CAAC;gBACX,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE,SAAS;aAC5B,CAAC,CAAA;SACH;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;CACF,CAAA;AA/DC;IADC,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,iBAAS,EAAE,EAAE,WAAW,EAAE,6BAA6B,EAAE,CAAC;IAEzE,WAAA,IAAA,mBAAI,GAAE,CAAA;IACN,WAAA,IAAA,kBAAG,EAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,8BAAa,CAAC,CAAC,CAAA;IAEpC,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;gDA+BP;AAYD;IADC,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,sCAAsC,EAAE,CAAC;IAC7D,WAAA,IAAA,mBAAI,GAAE,CAAA;IAAK,WAAA,IAAA,kBAAG,EAAC,KAAK,CAAC,CAAA;IAAe,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;mDAe7D;AAhEU,cAAc;IAD1B,IAAA,uBAAQ,GAAE;GACE,cAAc,CAiE1B;AAjEY,wCAAc"}

package/logs/.08636eb59927f12972f6774f5947c8507b3564c2-audit.json

@@ -6,39 +6,14 @@
     "auditLog": "logs/.08636eb59927f12972f6774f5947c8507b3564c2-audit.json",
     "files": [
         {
-            "date": 1637657372344,
-            "name": "logs/application-2021-11-23-17.log",
-            "hash": "dc86852d895f59845837bbd599cbf0f5"
+            "date": 1636005255512,
+            "name": "logs/application-2021-11-04-14.log",
+            "hash": "82baeb9d01f51b2ebdb89d58c735e058"
         },
         {
-            "date": 1637658163098,
-            "name": "logs/application-2021-11-23-18.log",
-            "hash": "5edd4359fba7020d68c54d61c7924c89"
-        },
-        {
-            "date": 1637662675502,
-            "name": "logs/application-2021-11-23-19.log",
-            "hash": "66b232de5182568fbed4e616336284d9"
-        },
-        {
-            "date": 1637718646649,
-            "name": "logs/application-2021-11-24-10.log",
-            "hash": "a24d3e316c0f2c0fe79203f887f106df"
-        },
-        {
-            "date": 1637719304663,
-            "name": "logs/application-2021-11-24-11.log",
-            "hash": "c1b88e83ad2d8075e425e90b9ee987b3"
-        },
-        {
-            "date": 1637743385790,
-            "name": "logs/application-2021-11-24-17.log",
-            "hash": "40cfecbe3bd12f4776511745afa7e90c"
-        },
-        {
-            "date": 1637746682152,
-            "name": "logs/application-2021-11-24-18.log",
-            "hash": "961d2868d028f84e9242c710ba84fde2"
+            "date": 1636103946107,
+            "name": "logs/application-2021-11-05-18.log",
+            "hash": "dca379ac4e315b99f4a38f1350437523"
         }
     ]
 }

package/logs/.5e5d741d8b7784a2fbad65eedc0fd46946aaf6f2-audit.json

@@ -6,34 +6,24 @@
     "auditLog": "logs/.5e5d741d8b7784a2fbad65eedc0fd46946aaf6f2-audit.json",
     "files": [
         {
-            "date": 1637657375300,
-            "name": "logs/connections-2021-11-23-17.log",
-            "hash": "5c7c352db426865b2909ff76f4c53b48"
+            "date": 1635819464472,
+            "name": "logs/connections-2021-11-02-11.log",
+            "hash": "8bc1da3313a69261b4674f629d032e03"
         },
         {
-            "date": 1637658270378,
-            "name": "logs/connections-2021-11-23-18.log",
-            "hash": "fec3a36eba3b70e383ae92114f38e143"
+            "date": 1635906208371,
+            "name": "logs/connections-2021-11-03-11.log",
+            "hash": "a1311491c36196b33b2dd55f164b95f7"
         },
         {
-            "date": 1637662677621,
-            "name": "logs/connections-2021-11-23-19.log",
-            "hash": "14ae42756cf908019578a5abf71f16e9"
+            "date": 1636005260004,
+            "name": "logs/connections-2021-11-04-14.log",
+            "hash": "6d9ee9a4066c730e14f77f0396879d64"
         },
         {
-            "date": 1637718648504,
-            "name": "logs/connections-2021-11-24-10.log",
-            "hash": "66b33a27ee085f2cffc70d3aae95d503"
-        },
-        {
-            "date": 1637744215431,
-            "name": "logs/connections-2021-11-24-17.log",
-            "hash": "97d71fe2626ad99010a7fffa667966b2"
-        },
-        {
-            "date": 1637746683906,
-            "name": "logs/connections-2021-11-24-18.log",
-            "hash": "d15e7616daaabd2dc4b8fbd3dc37fa3d"
+            "date": 1636103949582,
+            "name": "logs/connections-2021-11-05-18.log",
+            "hash": "f7593c79bc2d00a3832d894f74b529f8"
         }
     ]
 }

package/logs/application-2021-11-04-14.log

@@ -0,0 +1,4 @@
+2021-11-04T05:54:18.294Z info: File Storage is Ready.
+2021-11-04T05:54:26.107Z info: Database connection established
+2021-11-04T05:54:30.807Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
+2021-11-04T05:54:30.812Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions

package/logs/application-2021-11-05-18.log

@@ -0,0 +1,6 @@
+2021-11-05T09:19:08.124Z info: File Storage is Ready.
+2021-11-05T09:19:12.759Z info: Database connection established
+2021-11-05T09:19:47.437Z info: File Storage is Ready.
+2021-11-05T09:19:51.042Z info: Database connection established
+2021-11-05T09:19:51.851Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
+2021-11-05T09:19:51.851Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/reference-app",
-  "version": "4.0.11",
+  "version": "4.0.16",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -37,50 +37,51 @@
     "docker:run": "docker run -it -p 4000:3000 hatiolab/reference-app:latest"
   },
   "dependencies": {
-    "@hatiolab/things-scene": "^2.7.21",
+    "@hatiolab/things-scene": "^2.7.27",
     "@material/mwc-checkbox": "^0.25.3",
-    "@operato/data-grist": "^0.2.35",
-    "@operato/ghost-print": "^0.2.35",
-    "@operato/ocr": "^0.2.35",
-    "@operato/popup": "^0.2.35",
-    "@operato/pull-to-refresh": "^0.2.35",
-    "@operato/scene-chartjs": "^0.0.10",
-    "@operato/scene-clock": "^0.0.10",
-    "@operato/scene-progressbar": "^0.0.10",
-    "@operato/scene-random": "^0.0.10",
-    "@operato/scene-switch": "^0.0.10",
-    "@things-factory/api": "^4.0.11",
-    "@things-factory/apptool-ui": "^4.0.11",
-    "@things-factory/auth-ui": "^4.0.11",
-    "@things-factory/board-service": "^4.0.11",
-    "@things-factory/board-ui": "^4.0.11",
-    "@things-factory/context-ui": "^4.0.11",
-    "@things-factory/dashboard": "^4.0.11",
-    "@things-factory/export-ui": "^4.0.11",
-    "@things-factory/export-ui-excel": "^4.0.11",
-    "@things-factory/grist-ui": "^4.0.11",
-    "@things-factory/help": "^4.0.11",
-    "@things-factory/i18n-ui": "^4.0.11",
-    "@things-factory/integration-ui": "^4.0.11",
-    "@things-factory/lite-menu": "^4.0.11",
-    "@things-factory/more-ui": "^4.0.11",
-    "@things-factory/notification": "^4.0.11",
-    "@things-factory/oauth2-client": "^4.0.11",
-    "@things-factory/print-ui": "^4.0.11",
-    "@things-factory/resource-ui": "^4.0.11",
-    "@things-factory/scene-form": "^4.0.11",
-    "@things-factory/scene-gauge": "^4.0.11",
+    "@operato/data-grist": "^0.2.47",
+    "@operato/ghost-print": "^0.2.47",
+    "@operato/input": "^0.2.47",
+    "@operato/ocr": "^0.2.47",
+    "@operato/popup": "^0.2.47",
+    "@operato/pull-to-refresh": "^0.2.47",
+    "@operato/scene-chartjs": "^0.0.20",
+    "@operato/scene-clock": "^0.0.20",
+    "@operato/scene-gauge": "^0.0.20",
+    "@operato/scene-indoor-map": "^0.0.20",
+    "@operato/scene-progressbar": "^0.0.20",
+    "@operato/scene-random": "^0.0.20",
+    "@operato/scene-switch": "^0.0.20",
+    "@things-factory/api": "^4.0.16",
+    "@things-factory/apptool-ui": "^4.0.16",
+    "@things-factory/auth-ui": "^4.0.16",
+    "@things-factory/board-service": "^4.0.16",
+    "@things-factory/board-ui": "^4.0.16",
+    "@things-factory/context-ui": "^4.0.16",
+    "@things-factory/dashboard": "^4.0.16",
+    "@things-factory/export-ui": "^4.0.16",
+    "@things-factory/export-ui-excel": "^4.0.16",
+    "@things-factory/grist-ui": "^4.0.16",
+    "@things-factory/help": "^4.0.16",
+    "@things-factory/i18n-ui": "^4.0.16",
+    "@things-factory/integration-ui": "^4.0.16",
+    "@things-factory/lite-menu": "^4.0.16",
+    "@things-factory/more-ui": "^4.0.16",
+    "@things-factory/notification": "^4.0.16",
+    "@things-factory/oauth2-client": "^4.0.16",
+    "@things-factory/print-ui": "^4.0.16",
+    "@things-factory/resource-ui": "^4.0.16",
+    "@things-factory/scene-form": "^4.0.16",
     "@things-factory/scene-half-roundrect": "^4.0.9",
-    "@things-factory/scene-indoor-map": "^4.0.11",
-    "@things-factory/scene-news-ticker": "^4.0.11",
-    "@things-factory/scene-tab": "^4.0.11",
-    "@things-factory/setting-base": "^4.0.11",
-    "@things-factory/setting-ui": "^4.0.11",
-    "@things-factory/shell": "^4.0.11",
-    "@things-factory/system-ui": "^4.0.11"
+    "@things-factory/scene-news-ticker": "^4.0.16",
+    "@things-factory/scene-tab": "^4.0.16",
+    "@things-factory/setting-base": "^4.0.16",
+    "@things-factory/setting-ui": "^4.0.16",
+    "@things-factory/shell": "^4.0.16",
+    "@things-factory/system-ui": "^4.0.16"
   },
   "devDependencies": {
-    "@things-factory/builder": "^4.0.11"
+    "@things-factory/builder": "^4.0.16"
   },
-  "gitHead": "47745d8cdbe99f11d8d69bbcab3901c9771525a0"
+  "gitHead": "5a56e53e09d5b0a47b7446dbb2fa696232ad5414"
 }

package/server/service/reference/lambda-call.ts

@@ -5,20 +5,23 @@ import { gqlBuilder } from '@things-factory/utils'
 
 const appSyncConfig = config.get('awsAppSync')
 
-export async function interpretImages(images) {
+export async function extractInfos(images) {
+  const extraction = {
+    success_count: true,
+    failure_count: true,
+    result: {
+      boundaries: true,
+      texts: true
+    }
+  }
   const query = gqlBuilder.jsonToGraphQLQuery({
     mutation: {
-      upload: {
+      extractInfos: {
         __args: {
           images
         },
-        success_count: true,
-        failure_count: true,
-        result: {
-          key_values: true,
-          boundaries: true,
-          texts: true
-        }
+        ocr: extraction,
+        barcode: extraction
       }
     }
   })
@@ -57,7 +60,6 @@ function getRequestBody(images) {
         success_count
         failure_count
         results {
-          key_values
           boundaries
           texts
         } 

package/server/service/reference/reference-query.ts

@@ -5,7 +5,7 @@ import { Attachment, createAttachments } from '@things-factory/attachment-base'
 import { publishProgress, ScalarAny } from '@things-factory/shell'
 import { sleep } from '@things-factory/utils'
 
-import { interpretImages } from './lambda-call'
+import { extractInfos } from './lambda-call'
 
 const debug = require('debug')('things-factory:reference-app')
 
@@ -41,9 +41,9 @@ export class ReferenceQuery {
           return { data: image, name: filename, format: formatArr[formatArr.length - 1] }
         })
       )
-      const res = await interpretImages(files)
+      const res = await extractInfos(files)
       console.log('interpretImages response', JSON.stringify(res, null, ' '))
-      return res.data?.upload?.result
+      return res.data?.extractInfos
     }
 
     return []

package/config.development.js

@@ -1,7 +0,0 @@
-module.exports = {
-  subdomain: 'system',
-  awsAppSync: {
-    apiUrl: 'https://x4l2mt6nxzbdjcrf2kfwclahdq.appsync-api.ap-northeast-2.amazonaws.com/graphql',
-    apiKey: 'da2-rdg35mntfbcl5f46y22ulabbq4'
-  }
-}

package/logs/application-2021-11-23-17.log

@@ -1,4 +0,0 @@
-2021-11-23T08:49:34.265Z info: File Storage is Ready.
-2021-11-23T08:49:37.260Z info: Database connection established
-2021-11-23T08:49:38.181Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-23T08:49:38.182Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions

package/logs/application-2021-11-23-18.log

@@ -1,27 +0,0 @@
-2021-11-23T09:02:43.092Z error: Cannot query field "myFavorites" on type "Query".
-2021-11-23T09:03:05.183Z error: debug is not defined
-2021-11-23T09:04:29.750Z info: File Storage is Ready.
-2021-11-23T09:04:32.361Z info: Database connection established
-2021-11-23T09:04:33.241Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-23T09:04:33.242Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
-2021-11-23T09:08:35.639Z info: File Storage is Ready.
-2021-11-23T09:08:37.977Z info: Database connection established
-2021-11-23T09:08:38.902Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-23T09:08:38.903Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
-2021-11-23T09:11:15.322Z info: File Storage is Ready.
-2021-11-23T09:11:17.984Z info: Database connection established
-2021-11-23T09:11:19.023Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-23T09:11:19.023Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
-2021-11-23T09:23:35.017Z info: File Storage is Ready.
-2021-11-23T09:23:37.487Z info: Database connection established
-2021-11-23T09:23:38.429Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-23T09:23:38.431Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
-2021-11-23T09:30:35.903Z info: File Storage is Ready.
-2021-11-23T09:30:38.329Z info: Database connection established
-2021-11-23T09:30:39.274Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-23T09:30:39.275Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
-2021-11-23T09:31:35.431Z error: Cannot return null for non-nullable field Query.ocrRequest.
-2021-11-23T09:33:01.773Z info: File Storage is Ready.
-2021-11-23T09:33:04.409Z info: Database connection established
-2021-11-23T09:33:05.293Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-23T09:33:05.294Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions

package/logs/application-2021-11-23-19.log

@@ -1,8 +0,0 @@
-2021-11-23T10:17:57.053Z info: File Storage is Ready.
-2021-11-23T10:17:59.801Z info: Database connection established
-2021-11-23T10:18:01.245Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-23T10:18:01.246Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
-2021-11-23T10:20:33.720Z info: File Storage is Ready.
-2021-11-23T10:20:36.552Z info: Database connection established
-2021-11-23T10:20:37.706Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-23T10:20:37.706Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions

package/logs/application-2021-11-24-10.log

@@ -1,14 +0,0 @@
-2021-11-24T01:50:47.608Z info: File Storage is Ready.
-2021-11-24T01:50:49.893Z info: Database connection established
-2021-11-24T01:50:50.541Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-24T01:50:50.541Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
-2021-11-24T01:54:42.921Z info: File Storage is Ready.
-2021-11-24T01:54:45.288Z info: Database connection established
-2021-11-24T01:54:46.068Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-24T01:54:46.069Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
-2021-11-24T01:55:25.596Z error: Variable "$images" of required type "[Upload!]!" was not provided.
-2021-11-24T01:58:02.219Z info: File Storage is Ready.
-2021-11-24T01:58:04.694Z info: Database connection established
-2021-11-24T01:58:05.494Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-24T01:58:05.494Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions
-2021-11-24T01:59:18.226Z error: Variable "$images" of required type "[Upload!]!" was not provided.

package/logs/application-2021-11-24-11.log

@@ -1,3 +0,0 @@
-2021-11-24T02:01:44.658Z error: Variable "$images" of required type "[Upload!]!" was not provided.
-2021-11-24T02:04:02.404Z error: Variable "$images" of required type "[Upload!]!" was not provided.
-2021-11-24T02:04:29.276Z error: Variable "$images" of required type "[Upload!]!" was not provided.

package/logs/application-2021-11-24-17.log

@@ -1,4 +0,0 @@
-2021-11-24T08:56:54.576Z info: File Storage is Ready.
-2021-11-24T08:56:56.816Z info: Database connection established
-2021-11-24T08:56:57.460Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-24T08:56:57.460Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions

package/logs/application-2021-11-24-18.log

@@ -1,4 +0,0 @@
-2021-11-24T09:38:03.063Z info: File Storage is Ready.
-2021-11-24T09:38:05.568Z info: Database connection established
-2021-11-24T09:38:06.226Z info: 🚀 Server ready at http://0.0.0.0:3000/graphql
-2021-11-24T09:38:06.226Z info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/subscriptions