@things-factory/reference-app 4.0.3 → 4.0.7

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

@@ -1,18 +1,23 @@
-import { Resolver, Mutation, Query, Root, Arg, Ctx, Directive } from 'type-graphql'
-import { GraphQLUpload, FileUpload } from 'graphql-upload'
-import { publishProgress } from '@things-factory/shell'
-import { sleep } from '@things-factory/utils'
+import { FileUpload, GraphQLUpload } from 'graphql-upload'
+import { Arg, Ctx, Query, Resolver, Root } from 'type-graphql'
+
 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'
+
+const debug = require('debug')('things-factory:reference-app')
 
 @Resolver()
 export class ReferenceQuery {
-  @Query(returns => String, { description: 'To reference of ocr request' })
+  @Query(returns => ScalarAny, { description: 'To reference of ocr request' })
   async ocrRequest(
     @Root() _,
     @Arg('images', () => [GraphQLUpload])
     images: FileUpload[],
     @Ctx() context: any
-  ): Promise<string> {
+  ): Promise<ScalarAny> {
     const { domain, user, tx } = context.state
     const all = Promise.all(images)
 
@@ -25,9 +30,32 @@ export class ReferenceQuery {
         }
       })
       await createAttachments(_, { attachments }, context)
+
+      const files = await Promise.all(
+        images.map(async file => {
+          const { createReadStream, filename, mimetype } = await file
+          const readStream = createReadStream()
+          const image = await this.streamToString(readStream)
+          // format is 'image/jpeg'
+          const formatArr = mimetype.split('/')
+          return { data: image, name: filename, format: formatArr[formatArr.length - 1] }
+        })
+      )
+      const res = await interpretImages(files)
+      console.log('interpretImages response', JSON.stringify(res, null, ' '))
+      return res.data?.upload?.result
     }
 
-    return 'success'
+    return []
+  }
+
+  streamToString (stream) {
+    const chunks = [];
+    return new Promise((resolve, reject) => {
+      stream.on('data', (chunk) => chunks.push(Buffer.from(chunk)));
+      stream.on('error', (err) => reject(err));
+      stream.on('end', () => resolve(Buffer.concat(chunks).toString('base64')));
+    })
   }
 
   @Query(returns => String, { description: 'To reference of pending job progress' })

package/things-factory.config.js

@@ -56,6 +56,10 @@ export default {
       tagname: 'direct-print',
       page: 'direct-print'
     },
+    {
+      tagname: 'label-scan-page',
+      page: 'label-scan-page'
+    },
     {
       tagname: 'ghost-print-page',
       page: 'ghost-print-page'

package/translations/en.json

@@ -6,5 +6,6 @@
   "field.color": "color",
   "field.role": "role",
   "field.dynamic_type": "dynamic type",
-  "field.dynamic_value": "dynamic value"
-}
+  "field.dynamic_value": "dynamic value",
+  "text.ox-data-report-grand-total": "grand total"
+}

package/translations/ko.json

@@ -6,5 +6,6 @@
   "field.color": "색상",
   "field.role": "역할",
   "field.dynamic_type": "변화 타입",
-  "field.dynamic_value": "변화타입 값"
-}
+  "field.dynamic_value": "변화타입 값",
+  "text.ox-data-report-grand-total": "총합계"
+}

package/translations/ms.json

@@ -6,5 +6,6 @@
   "field.color": "color",
   "field.role": "role",
   "field.dynamic_type": "dynamic type",
-  "field.dynamic_value": "dynamic value"
-}
+  "field.dynamic_value": "dynamic value",
+  "text.ox-data-report-grand-total": "grand total"
+}

package/translations/zh.json

@@ -6,5 +6,6 @@
   "field.color": "color",
   "field.role": "role",
   "field.dynamic_type": "dynamic type",
-  "field.dynamic_value": "dynamic value"
-}
+  "field.dynamic_value": "dynamic value",
+  "text.ox-data-report-grand-total": "grand total"
+}

package/views/auth-page.html

@@ -80,7 +80,6 @@
     <!-- Load webcomponents-loader.js to check and load any polyfills your browser needs -->
     <script src="node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
     <script src="node_modules/web-animations-js/web-animations-next.min.js"></script>
-    <script src="node_modules/@lottiefiles/lottie-player/dist/lottie-player.js"></script>
     <!-- Built with love using PWA Starter Kit -->
 
     <script src="<%- elementScript %>"></script>

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

@@ -1,4 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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