@things-factory/barcode-base 8.0.0 → 9.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/barcode-base",
-  "version": "8.0.0",
+  "version": "9.0.0-beta.3",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,9 +27,9 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@operato/barcode": "^8.0.0",
-    "@things-factory/print-base": "^8.0.0",
+    "@operato/barcode": "^9.0.0-beta",
+    "@things-factory/print-base": "^9.0.0-beta.3",
     "@zxing/library": "^0.21.1"
   },
-  "gitHead": "07ef27d272dd9a067a9648ac7013748510556a18"
+  "gitHead": "1d7e0dd4c88f3c3f3bd311c00e4b1d1542d53634"
 }

package/client/bootstrap.ts

@@ -1,42 +0,0 @@
-import { store } from '@operato/shell'
-import { REGISTER_PRINTER_TYPE } from '@things-factory/print-base/client'
-import { labelPrinterHandler } from './handlers/label-printer-handler'
-
-export default function bootstrap() {
-  store.dispatch({
-    type: REGISTER_PRINTER_TYPE,
-    printerType: 'label',
-    handler: labelPrinterHandler
-  })
-
-  /* if support webusb */
-  if ('usb' in navigator) {
-    import('./handlers/usb-label-printer-handler').then(handler =>
-      store.dispatch({
-        type: REGISTER_PRINTER_TYPE,
-        printerType: 'usb',
-        handler: handler.usbLabelPrinterHandler,
-        staticPrinters: [
-          {
-            name: 'USB Printer',
-            type: 'usb'
-          }
-        ]
-      })
-    )
-  }
-
-  import('./handlers/browser-printer-handler').then(handler =>
-    store.dispatch({
-      type: REGISTER_PRINTER_TYPE,
-      printerType: 'zebra-browser-print',
-      handler: handler.browserPrinterHandler,
-      staticPrinters: [
-        {
-          name: 'Browser Print for Zebra Printer',
-          type: 'zebra-browser-print'
-        }
-      ]
-    })
-  )
-}

package/client/default-label-printer-setting-let.ts

@@ -1,78 +0,0 @@
-import '@things-factory/setting-base'
-import '@material/web/select/outlined-select'
-
-import '@operato/i18n/ox-i18n.js'
-
-import { css, html, LitElement } from 'lit'
-import { customElement, property } from 'lit/decorators.js'
-
-import { i18next, localize } from '@operato/i18n'
-import { clientSettingStore } from '@operato/shell'
-
-@customElement('default-label-printer-setting-let')
-export class DefaultLabelPrinterSettingLet extends localize(i18next)(LitElement) {
-  static styles = [
-    css`
-      label {
-        display: flex;
-        gap: 10px;
-        align-items: center;
-
-        font: var(--label-font);
-        color: var(--label-color, var(--md-sys-color-on-surface));
-        text-transform: var(--label-text-transform);
-      }
-    `
-  ]
-
-  @property({ type: String }) printerType?: 'direct-usb' | 'zebra-browser-print'
-
-  render() {
-    return html`
-      <setting-let>
-        <ox-i18n slot="title" msgid="title.default label printer"></ox-i18n>
-
-        <div slot="content">
-          <md-outlined-select
-            label=${String(i18next.t('label.default label printer'))}
-            group
-            helper="Please select which printer connection type to use for label printing."
-            @change=${(e: Event) => this.onChange(e)}
-          >
-            <md-select-option aria-label="blank"></md-select-option>
-            <md-select-option value="direct-usb" ?selected=${this.printerType == 'direct-usb'}>
-              <div slot="headline">usb connected printer</div>
-            </md-select-option>
-            <md-select-option value="zebra-browser-print" ?selected=${this.printerType == 'zebra-browser-print'}>
-              <div slot="headline">zebra browser print</div>
-            </md-select-option>
-          </md-outlined-select>
-        </div>
-      </setting-let>
-    `
-  }
-
-  async firstUpdated() {
-    this.printerType = (await clientSettingStore.get('default-label-printer-type'))?.value || 'direct-usb'
-  }
-
-  async onChange(e: Event) {
-    const value = (e.target as HTMLInputElement).value
-
-    const valueFromStore = (await clientSettingStore.get('default-label-printer-type'))?.value
-    if (!value || value == valueFromStore) {
-      return
-    }
-
-    try {
-      await clientSettingStore.put({
-        key: 'default-label-printer-type',
-        value
-      })
-    } catch (e) {
-      console.error(e)
-    }
-
-    location.reload()
-  }
-}

package/client/direct-print.ts

@@ -1,20 +0,0 @@
-import { BrowserPrinter, USBPrinter } from '@operato/barcode'
-import { clientSettingStore } from '@operato/shell'
-
-export class DirectPrinter {
-  private printer?: USBPrinter | BrowserPrinter
-
-  async getPrinter() {
-    const v = await clientSettingStore.get('default-label-printer-type')
-    const printerType = v?.value || 'direct-usb'
-    this.printer = printerType == 'direct-usb' ? new USBPrinter() : new BrowserPrinter()
-  }
-
-  async print(command) {
-    if (!this.printer) {
-      await this.getPrinter()
-    }
-
-    await this.printer?.print(command)
-  }
-}

package/client/handlers/browser-printer-handler.ts

@@ -1,25 +0,0 @@
-import { BrowserPrinter } from '@operato/barcode'
-
-var printer
-
-/**
- * Zebra의  BrowserPrinter를 이용한 프린트 기능을 제공한다.
- * (https://www.zebra.com/us/en/products/software/barcode-printers/link-os/browser-print.html)
- *
- */
-export async function browserPrinterHandler(
-  { type: printerType, name: printerName, txtRecord },
-  { accept, content, name, options }
-) {
-  const board = typeof content == 'function' ? await content.call() : content
-
-  try {
-    if (!printer) {
-      printer = new BrowserPrinter()
-    }
-
-    await printer.print(board)
-  } catch (e: any) {
-    throw new Error(e)
-  }
-}

package/client/handlers/label-printer-handler.ts

@@ -1,46 +0,0 @@
-export async function labelPrinterHandler(
-  { type: printerType, name: printerName, txtRecord },
-  { accept, content, name, options }
-) {
-  var { ['service-url']: serviceUrl } = txtRecord
-  /* content should be a element */
-  const board = typeof content == 'function' ? await content.call() : content
-
-  /*
-   * 프린트 서비스를 호출한다.
-   * 서비스명 : GET /print-label/${content.id}?printerId=${name}
-   */
-
-  // const response = await fetch(`/print-label/${board.id}?printerId=${printerName}`, {
-  //   method: 'GET',
-  //   credentials: 'include',
-  //   headers: {
-  //     'Content-Type': 'application/json',
-  //     Accept: 'application/json'
-  //   }
-  // })
-
-  /*
-   * 프린트 서비스를 호출한다.
-   * 서비스명 : POST /print
-   * 파라미터 : printerId, data
-   */
-  const response = await fetch(`${serviceUrl ? serviceUrl : ''}/print`, {
-    method: 'POST',
-    credentials: 'include',
-    headers: {
-      'Content-Type': 'application/json',
-      Accept: 'application/json'
-    },
-    body: JSON.stringify({
-      printerId: printerName,
-      data: board
-    })
-  })
-
-  if (response.ok) {
-    return true
-  } else {
-    throw new Error(String(response.status))
-  }
-}

package/client/handlers/usb-label-printer-handler.ts

@@ -1,20 +0,0 @@
-import { USBPrinter } from '@operato/barcode'
-
-var printer
-
-export async function usbLabelPrinterHandler(
-  { type: printerType, name: printerName, txtRecord },
-  { accept, content, name, options }
-) {
-  const board = typeof content == 'function' ? await content.call() : content
-
-  try {
-    if (!printer) {
-      printer = new USBPrinter()
-    }
-
-    await printer.connectAndPrint(board)
-  } catch (e: any) {
-    throw new Error(e)
-  }
-}

package/client/index.ts

@@ -1,2 +0,0 @@
-export * from './direct-print'
-export * from './default-label-printer-setting-let'