From 60198b1e98e1344a9705fa9f9d28ed2b23edbe15 Mon Sep 17 00:00:00 2001 From: ocogeclub Date: Tue, 24 May 2022 22:11:10 +0900 Subject: [PATCH] [update] renamed gpio local module directory --- blocks/sensors/amg8833/AMG8833x.js | 2 +- blocks/sensors/amg8833/index.js | 2 +- blocks/sensors/bme280/BME280x.js | 2 +- blocks/sensors/bme280/index.js | 2 +- blocks/sensors/paj7620/PAJ7620x.js | 2 +- blocks/sensors/paj7620/index.js | 2 +- index_elutil.js | 4 +- .../lgpio/binding.gyp | 0 .../lgpio/index.js | 0 .../lgpio/lgpio.cpp | 0 .../lgpio/package.json | 2 +- .../pigpio/binding.gyp | 0 .../pigpio/index.js | 0 .../pigpio/package.json | 2 +- .../pigpio/pigpio.cpp | 0 main.js | 6 +- package-lock.json | 283 ++++++++++-------- package.json | 14 +- ugj_blocks.js | 8 +- 19 files changed, 191 insertions(+), 140 deletions(-) rename local_modules/{@ocogeclub => @ocoge.club}/lgpio/binding.gyp (100%) rename local_modules/{@ocogeclub => @ocoge.club}/lgpio/index.js (100%) rename local_modules/{@ocogeclub => @ocoge.club}/lgpio/lgpio.cpp (100%) rename local_modules/{@ocogeclub => @ocoge.club}/lgpio/package.json (84%) rename local_modules/{@ocogeclub => @ocoge.club}/pigpio/binding.gyp (100%) rename local_modules/{@ocogeclub => @ocoge.club}/pigpio/index.js (100%) rename local_modules/{@ocogeclub => @ocoge.club}/pigpio/package.json (83%) rename local_modules/{@ocogeclub => @ocoge.club}/pigpio/pigpio.cpp (100%) diff --git a/blocks/sensors/amg8833/AMG8833x.js b/blocks/sensors/amg8833/AMG8833x.js index d6d6dfd..40523ef 100644 --- a/blocks/sensors/amg8833/AMG8833x.js +++ b/blocks/sensors/amg8833/AMG8833x.js @@ -1,7 +1,7 @@ 'use strict'; const err_msg = 'AMG8833 is already opened. Please close old connection to use new one.'; -const pig = require('@ocogeclub/pigpio'); +const pig = require('@ocoge.club/pigpio'); let pi = -1; let i2c_hand = -1; diff --git a/blocks/sensors/amg8833/index.js b/blocks/sensors/amg8833/index.js index 4f81afa..d4dcbaf 100644 --- a/blocks/sensors/amg8833/index.js +++ b/blocks/sensors/amg8833/index.js @@ -59,7 +59,7 @@ Blockly.Blocks['ugj_grideye_init'] = { Blockly.JavaScript['ugj_grideye_init'] = function (block) { var dropdown_addr = block.getFieldValue('addr'); Blockly.JavaScript.provideFunction_( - 'require_gpio', [`const _pi = require('@ocogeclub/` + elutil.gpio_backend + `');`] + 'require_gpio', [`const _pi = require('@ocoge.club/` + elutil.gpio_backend + `');`] ); let modpath = elutil.path.join(elutil.blocks_sensors_dir, 'amg8833', 'AMG8833x.js'); Blockly.JavaScript.provideFunction_( diff --git a/blocks/sensors/bme280/BME280x.js b/blocks/sensors/bme280/BME280x.js index 5411eca..eb54c74 100644 --- a/blocks/sensors/bme280/BME280x.js +++ b/blocks/sensors/bme280/BME280x.js @@ -42,7 +42,7 @@ this.REGISTER_TEMP_DATA = 0xFA; this.REGISTER_HUMIDITY_DATA = 0xFD; exports.init = async (options) => { - this.pig = require('@ocogeclub/pigpio'); + this.pig = require('@ocoge.club/pigpio'); this.pi = await this.pig._pigpio_start('', ''); this.i2cBusNo = (options && options.hasOwnProperty('i2cBusNo')) ? options.i2cBusNo : 1; diff --git a/blocks/sensors/bme280/index.js b/blocks/sensors/bme280/index.js index d76f568..a6b0d11 100644 --- a/blocks/sensors/bme280/index.js +++ b/blocks/sensors/bme280/index.js @@ -18,7 +18,7 @@ Blockly.Blocks['ugj_bme280'] = { Blockly.JavaScript['ugj_bme280'] = function (block) { var dropdown_addr = block.getFieldValue('addr'); Blockly.JavaScript.provideFunction_( - 'require_gpio', [`const _pi = require('@ocogeclub/` + elutil.gpio_backend + `');`] + 'require_gpio', [`const _pi = require('@ocoge.club/` + elutil.gpio_backend + `');`] ); let modpath = elutil.path.join(elutil.blocks_sensors_dir, 'bme280', 'BME280x.js'); Blockly.JavaScript.provideFunction_( diff --git a/blocks/sensors/paj7620/PAJ7620x.js b/blocks/sensors/paj7620/PAJ7620x.js index c4ae933..3c83c7e 100644 --- a/blocks/sensors/paj7620/PAJ7620x.js +++ b/blocks/sensors/paj7620/PAJ7620x.js @@ -322,7 +322,7 @@ exports.init = async (i2c_bus, i2c_addr, wael = null) => { await exports.stop(); }); } - pig = require('@ocogeclub/pigpio'); + pig = require('@ocoge.club/pigpio'); if (pi >= 0) { throw new Error(err_msg); return; } pi = await pig._pigpio_start('', ''); if (i2c_hand >= 0) { throw new Error(err_msg); return; } diff --git a/blocks/sensors/paj7620/index.js b/blocks/sensors/paj7620/index.js index 1198be8..ea86177 100644 --- a/blocks/sensors/paj7620/index.js +++ b/blocks/sensors/paj7620/index.js @@ -33,7 +33,7 @@ Blockly.Blocks['ugj_gesture_init'] = { Blockly.JavaScript['ugj_gesture_init'] = function (block) { var value_i2c_addr = Blockly.JavaScript.valueToCode(block, 'i2c_addr', Blockly.JavaScript.ORDER_ATOMIC); Blockly.JavaScript.provideFunction_( - 'require_gpio', [`const _pi = require('@ocogeclub/` + elutil.gpio_backend + `');`] + 'require_gpio', [`const _pi = require('@ocoge.club/` + elutil.gpio_backend + `');`] ); let modpath = elutil.path.join(elutil.blocks_sensors_dir, 'paj7620', 'PAJ7620x.js'); Blockly.JavaScript.provideFunction_( diff --git a/index_elutil.js b/index_elutil.js index 57227c4..a836058 100644 --- a/index_elutil.js +++ b/index_elutil.js @@ -242,7 +242,7 @@ class elUtil { // GPIO 関連：リロードでGPIOをロックしたままハンドルを失うのを防ぐ cleanupGPIO() { // this.ugjEmitter.emit('device_stop');//デバイス停止イベント - require('@ocogeclub/' + this.gpio_backend).close_all_handle(); + require('@ocoge.club/' + this.gpio_backend).close_all_handle(); } // 設定(保存ファイルパスと未保存フラグ）をローカルストレージに保存 @@ -381,7 +381,7 @@ if (!is_el) { case 'nodemailer': block = 'メール送信'; break; - case '@ocogeclub/pigpio': + case '@ocoge.club/pigpio': block = 'GPIO'; break; case 'fs': diff --git a/local_modules/@ocogeclub/lgpio/binding.gyp b/local_modules/@ocoge.club/lgpio/binding.gyp similarity index 100% rename from local_modules/@ocogeclub/lgpio/binding.gyp rename to local_modules/@ocoge.club/lgpio/binding.gyp diff --git a/local_modules/@ocogeclub/lgpio/index.js b/local_modules/@ocoge.club/lgpio/index.js similarity index 100% rename from local_modules/@ocogeclub/lgpio/index.js rename to local_modules/@ocoge.club/lgpio/index.js diff --git a/local_modules/@ocogeclub/lgpio/lgpio.cpp b/local_modules/@ocoge.club/lgpio/lgpio.cpp similarity index 100% rename from local_modules/@ocogeclub/lgpio/lgpio.cpp rename to local_modules/@ocoge.club/lgpio/lgpio.cpp diff --git a/local_modules/@ocogeclub/lgpio/package.json b/local_modules/@ocoge.club/lgpio/package.json similarity index 84% rename from local_modules/@ocogeclub/lgpio/package.json rename to local_modules/@ocoge.club/lgpio/package.json index b3f4539..9e61c03 100644 --- a/local_modules/@ocogeclub/lgpio/package.json +++ b/local_modules/@ocoge.club/lgpio/package.json @@ -1,5 +1,5 @@ { - "name": "@ocogeclub/lgpio", + "name": "@ocoge.club/lgpio", "version": "0.0.1", "main": "index.js", "private": true, diff --git a/local_modules/@ocogeclub/pigpio/binding.gyp b/local_modules/@ocoge.club/pigpio/binding.gyp similarity index 100% rename from local_modules/@ocogeclub/pigpio/binding.gyp rename to local_modules/@ocoge.club/pigpio/binding.gyp diff --git a/local_modules/@ocogeclub/pigpio/index.js b/local_modules/@ocoge.club/pigpio/index.js similarity index 100% rename from local_modules/@ocogeclub/pigpio/index.js rename to local_modules/@ocoge.club/pigpio/index.js diff --git a/local_modules/@ocogeclub/pigpio/package.json b/local_modules/@ocoge.club/pigpio/package.json similarity index 83% rename from local_modules/@ocogeclub/pigpio/package.json rename to local_modules/@ocoge.club/pigpio/package.json index d61ab1c..8702fd8 100644 --- a/local_modules/@ocogeclub/pigpio/package.json +++ b/local_modules/@ocoge.club/pigpio/package.json @@ -1,5 +1,5 @@ { - "name": "@ocogeclub/pigpio", + "name": "@ocoge.club/pigpio", "version": "0.0.1", "main": "index.js", "private": true, diff --git a/local_modules/@ocogeclub/pigpio/pigpio.cpp b/local_modules/@ocoge.club/pigpio/pigpio.cpp similarity index 100% rename from local_modules/@ocogeclub/pigpio/pigpio.cpp rename to local_modules/@ocoge.club/pigpio/pigpio.cpp diff --git a/main.js b/main.js index 2782201..9a65546 100644 --- a/main.js +++ b/main.js @@ -14,8 +14,10 @@ function createWindow() { win = new BrowserWindow({ /** Icon */ icon: path.join(__dirname, "icon.png"), - width: 1280, - height: 940, + width: 1600, + height: 900, + // width: 1280, + // height: 940, webPreferences: { // preload: path.join(__dirname, 'preload.js'), nodeIntegration: true, diff --git a/package-lock.json b/package-lock.json index 25a36c2..b59b45a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,15 +9,15 @@ "version": "0.1.6", "license": "ISC", "dependencies": { - "@ocogeclub/pigpio": "file:local_modules/@ocogeclub/pigpio", + "@ocoge.club/pigpio": "file:local_modules/@ocoge.club/pigpio", "@tensorflow-models/blazeface": "^0.0.7", "@tensorflow-models/knn-classifier": "^1.2.4", "@tensorflow-models/mobilenet": "^2.1.0", - "@tensorflow/tfjs": "^3.15.0", - "@tensorflow/tfjs-backend-wasm": "^3.15.0", - "axios": "^0.26.1", + "@tensorflow/tfjs": "^3.17.0", + "@tensorflow/tfjs-backend-wasm": "^3.17.0", + "axios": "^0.27.2", "electron-squirrel-startup": "^1.0.0", - "nodemailer": "^6.7.3", + "nodemailer": "^6.7.5", "tensorset": "^1.2.9" }, "devDependencies": { @@ -26,10 +26,24 @@ "@electron-forge/maker-rpm": "^6.0.0-beta.63", "@electron-forge/maker-squirrel": "6.0.0-beta.33", "@electron-forge/maker-zip": "^6.0.0-beta.63", - "electron": "^18.0.4", + "electron": "^18.2.3", "electron-rebuild": "^3.2.7" } }, + "local_modules/@ocoge.club/pigpio": { + "version": "0.0.1", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "bindings": "^1.5.0", + "node-addon-api": "^1.7.1" + } + }, + "local_modules/@ocoge.club/pigpio/node_modules/node-addon-api": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", + "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==" + }, "local_modules/@ocogeclub/amg8833": { "version": "0.0.1", "extraneous": true, @@ -56,17 +70,13 @@ }, "local_modules/@ocogeclub/pigpio": { "version": "0.0.1", + "extraneous": true, "license": "MIT", "dependencies": { "bindings": "^1.5.0", "node-addon-api": "^1.7.1" } }, - "local_modules/@ocogeclub/pigpio/node_modules/node-addon-api": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", - "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==" - }, "node_modules/@electron-forge/async-ora": { "version": "6.0.0-beta.63", "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.63.tgz", @@ -1420,8 +1430,8 @@ "node": ">=10" } }, - "node_modules/@ocogeclub/pigpio": { - "resolved": "local_modules/@ocogeclub/pigpio", + "node_modules/@ocoge.club/pigpio": { + "resolved": "local_modules/@ocoge.club/pigpio", "link": true }, "node_modules/@sindresorhus/is": { @@ -1473,16 +1483,16 @@ } }, "node_modules/@tensorflow/tfjs": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs/-/tfjs-3.15.0.tgz", - "integrity": "sha512-sXcgD5hJsFsKlsBqSQYL21i27PtZ2V4fJLpKhGHXbNxvWq7B83UJuAzhc05x9hU6Ectnq4/41cMdTN/D+pe75Q==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs/-/tfjs-3.17.0.tgz", + "integrity": "sha512-mLN0z5fOdjzikQbYeZQALQYjSFt7OYTrTl+Ky8nkMv0bvb69szFVS/655ir4zkTYL4F/YmU140w8Ml+DVHtNkQ==", "dependencies": { - "@tensorflow/tfjs-backend-cpu": "3.15.0", - "@tensorflow/tfjs-backend-webgl": "3.15.0", - "@tensorflow/tfjs-converter": "3.15.0", - "@tensorflow/tfjs-core": "3.15.0", - "@tensorflow/tfjs-data": "3.15.0", - "@tensorflow/tfjs-layers": "3.15.0", + "@tensorflow/tfjs-backend-cpu": "3.17.0", + "@tensorflow/tfjs-backend-webgl": "3.17.0", + "@tensorflow/tfjs-converter": "3.17.0", + "@tensorflow/tfjs-core": "3.17.0", + "@tensorflow/tfjs-data": "3.17.0", + "@tensorflow/tfjs-layers": "3.17.0", "argparse": "^1.0.10", "chalk": "^4.1.0", "core-js": "3", @@ -1494,9 +1504,9 @@ } }, "node_modules/@tensorflow/tfjs-backend-cpu": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-3.15.0.tgz", - "integrity": "sha512-f+GREHSiVkVIpFAwkjB7YWcZefqQvCKQhrNjZzm1WX4VdnWlo0b1lTI+gPIIYNk4LEFMBNJbfqy/N1xNS/SOLQ==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-3.17.0.tgz", + "integrity": "sha512-alfmaPLnsa/DvkhnPoX/r9ZVDcSuRZUJEElaG3o84JrCBOqzq2jcFwaT9KxchN8rDLmKjJMLQkcQx/bSp/Oz4w==", "dependencies": { "@types/seedrandom": "2.4.27", "seedrandom": "2.4.3" @@ -1505,27 +1515,27 @@ "yarn": ">= 1.3.2" }, "peerDependencies": { - "@tensorflow/tfjs-core": "3.15.0" + "@tensorflow/tfjs-core": "3.17.0" } }, "node_modules/@tensorflow/tfjs-backend-wasm": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-wasm/-/tfjs-backend-wasm-3.15.0.tgz", - "integrity": "sha512-Oohpk0hOvMPabBqe3NyTS7/oZy2dcsALMGlsaz7t5bJNxEVOambHsrcEtD5qbmQcuVBITArutF2myO8cV1QeHA==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-wasm/-/tfjs-backend-wasm-3.17.0.tgz", + "integrity": "sha512-hfh4VpYr0C1Qu1uuO2SQH4WuX62OdDkg2e5/rFFgyjMg/avf94udgXtvkD2f4VUMwsoiZk1p40+rZCCnoCBB2A==", "dependencies": { - "@tensorflow/tfjs-backend-cpu": "3.15.0", + "@tensorflow/tfjs-backend-cpu": "3.17.0", "@types/emscripten": "~0.0.34" }, "peerDependencies": { - "@tensorflow/tfjs-core": "3.15.0" + "@tensorflow/tfjs-core": "3.17.0" } }, "node_modules/@tensorflow/tfjs-backend-webgl": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-3.15.0.tgz", - "integrity": "sha512-QOxbTABFbP+m+UmCVB8VQlmZbsXiJOP8QRkRRZHhGWNKjtT3eWi+ROS1tbloS7/Q20SEmNZXCvcsjv0TBgFQPw==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-3.17.0.tgz", + "integrity": "sha512-OC/IvU4TNx+B0J51kzCvSPWrC5qXtjY2aAsUvqXb9edhSMwrhC0sSS64t+KuIuPbNiAlVqPvlWZDz3WKPiIPdA==", "dependencies": { - "@tensorflow/tfjs-backend-cpu": "3.15.0", + "@tensorflow/tfjs-backend-cpu": "3.17.0", "@types/offscreencanvas": "~2019.3.0", "@types/seedrandom": "2.4.27", "@types/webgl-ext": "0.0.30", @@ -1536,26 +1546,27 @@ "yarn": ">= 1.3.2" }, "peerDependencies": { - "@tensorflow/tfjs-core": "3.15.0" + "@tensorflow/tfjs-core": "3.17.0" } }, "node_modules/@tensorflow/tfjs-converter": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-converter/-/tfjs-converter-3.15.0.tgz", - "integrity": "sha512-FBk3qGvNfS1xCw+ZLXCiD72vpR/rZaShFOY7HmLtTTfWlebWowrjaNqjvO8SKc7UGtRR/GJ7Bf3TgKyr9D3g0Q==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-converter/-/tfjs-converter-3.17.0.tgz", + "integrity": "sha512-AlnIg7aKtfiFq7/ZrWDsVgaw82Uig2KLJY2MOAwadpI4OqhKwwArFHVbVBiOhAEHmp6obwwYaGtItmSM+dzlUQ==", "peerDependencies": { - "@tensorflow/tfjs-core": "3.15.0" + "@tensorflow/tfjs-core": "3.17.0" } }, "node_modules/@tensorflow/tfjs-core": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-core/-/tfjs-core-3.15.0.tgz", - "integrity": "sha512-X1XGr8rewm/n0RDMnaLRcRYsTHlQCqQUR5DCtjUf4TuII7kq/pkZ9xCKPPfS1qUd5jLy663h8j5cAyjJNUt/hw==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-core/-/tfjs-core-3.17.0.tgz", + "integrity": "sha512-PMqEDysVy3WsSK4pU+UaoINRjps1RTF2CPvS1sWgOJqc/rUz8mSMibMosti0Is6DHGw7UiAq53y9VMuzQRVJqA==", "dependencies": { "@types/long": "^4.0.1", "@types/offscreencanvas": "~2019.3.0", "@types/seedrandom": "2.4.27", "@types/webgl-ext": "0.0.30", + "@webgpu/types": "^0.1.16", "long": "4.0.0", "node-fetch": "~2.6.1", "seedrandom": "2.4.3" @@ -1565,24 +1576,24 @@ } }, "node_modules/@tensorflow/tfjs-data": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-data/-/tfjs-data-3.15.0.tgz", - "integrity": "sha512-x8JOhpIsqN9jIWZqEmt2vLYf49lIhekI6nyw/fgAKjtx+I4qKw2gY7/r11TewZRxyD2o7SOrSoNIZT8nQJ5YfQ==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-data/-/tfjs-data-3.17.0.tgz", + "integrity": "sha512-RgsdrGzWaQtxlRnk7Yiz8ebxbFfgNLITaFri6WxSPNZFI5ajLtw/daxp04ij9l1MIUJeJYgaKeMVXFvJwy8TAQ==", "dependencies": { "@types/node-fetch": "^2.1.2", "node-fetch": "~2.6.1" }, "peerDependencies": { - "@tensorflow/tfjs-core": "3.15.0", + "@tensorflow/tfjs-core": "3.17.0", "seedrandom": "~2.4.3" } }, "node_modules/@tensorflow/tfjs-layers": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-layers/-/tfjs-layers-3.15.0.tgz", - "integrity": "sha512-6MWTrRd+kK2rto/HXX0Gg9yGIkT0twvuzTHcxFHUJVlW3JYulRCp185h3AcBytyzqQeae5eA73aOovm3lBvN+A==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-layers/-/tfjs-layers-3.17.0.tgz", + "integrity": "sha512-SXx6k1va/RfiCmwaglbaN/eQzZ33xhCUZgk5zpRJkxk3Gx9xXRHb05HszM0BH+cokwmueWcJQpRjcnvjdKxtUg==", "peerDependencies": { - "@tensorflow/tfjs-core": "3.15.0" + "@tensorflow/tfjs-core": "3.17.0" } }, "node_modules/@tootallnate/once": { @@ -1657,9 +1668,9 @@ } }, "node_modules/@types/long": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", - "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz", + "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==" }, "node_modules/@types/minimatch": { "version": "3.0.5", @@ -1721,6 +1732,11 @@ "@types/node": "*" } }, + "node_modules/@webgpu/types": { + "version": "0.1.16", + "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.16.tgz", + "integrity": "sha512-9E61voMP4+Rze02jlTXud++Htpjyyk8vw5Hyw9FGRrmhHQg2GqbuOfwf5Klrb8vTxc2XWI3EfO7RUHMpxTj26A==" + }, "node_modules/abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -1956,11 +1972,25 @@ "dev": true }, "node_modules/axios": { - "version": "0.26.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", - "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", + "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", "dependencies": { - "follow-redirects": "^1.14.8" + "follow-redirects": "^1.14.9", + "form-data": "^4.0.0" + } + }, + "node_modules/axios/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" } }, "node_modules/balanced-match": { @@ -2826,9 +2856,9 @@ } }, "node_modules/electron": { - "version": "18.0.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-18.0.4.tgz", - "integrity": "sha512-xfsozNpFr3WzeM1EFlw2qqiqXbCrgQNBJJMlcC4/DUYVpkF8364SZenX7FFFA42NmwXiOEahkvvho/u7UrAcGg==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/electron/-/electron-18.2.3.tgz", + "integrity": "sha512-DJWX03hCRKTscsfXxmW4gmgFuseop+g+m4ml7NfOMfankD8uYyr2Xyi3Ui02inL9qZOlbLMeLVCu6jKCKs8p/w==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -4103,9 +4133,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.14.8", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", - "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==", + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", "funding": [ { "type": "individual", @@ -5741,9 +5771,9 @@ } }, "node_modules/nodemailer": { - "version": "6.7.3", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.3.tgz", - "integrity": "sha512-KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g==", + "version": "6.7.5", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.5.tgz", + "integrity": "sha512-6VtMpwhsrixq1HDYSBBHvW0GwiWawE75dS3oal48VqRhUvKJNnKnJo2RI/bCVQubj1vgrgscMNW4DHaD6xtMCg==", "engines": { "node": ">=6.0.0" } @@ -9168,8 +9198,8 @@ } } }, - "@ocogeclub/pigpio": { - "version": "file:local_modules/@ocogeclub/pigpio", + "@ocoge.club/pigpio": { + "version": "file:local_modules/@ocoge.club/pigpio", "requires": { "bindings": "^1.5.0", "node-addon-api": "^1.7.1" @@ -9213,16 +9243,16 @@ "integrity": "sha512-JjqT9ijHDFA2FEpUGWg7H2lQ0GrMuE2VmiCRBYmUew6b4JKht8LXDjG5HxZh95YH6c/25sZWTpGeHbquloH+hw==" }, "@tensorflow/tfjs": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs/-/tfjs-3.15.0.tgz", - "integrity": "sha512-sXcgD5hJsFsKlsBqSQYL21i27PtZ2V4fJLpKhGHXbNxvWq7B83UJuAzhc05x9hU6Ectnq4/41cMdTN/D+pe75Q==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs/-/tfjs-3.17.0.tgz", + "integrity": "sha512-mLN0z5fOdjzikQbYeZQALQYjSFt7OYTrTl+Ky8nkMv0bvb69szFVS/655ir4zkTYL4F/YmU140w8Ml+DVHtNkQ==", "requires": { - "@tensorflow/tfjs-backend-cpu": "3.15.0", - "@tensorflow/tfjs-backend-webgl": "3.15.0", - "@tensorflow/tfjs-converter": "3.15.0", - "@tensorflow/tfjs-core": "3.15.0", - "@tensorflow/tfjs-data": "3.15.0", - "@tensorflow/tfjs-layers": "3.15.0", + "@tensorflow/tfjs-backend-cpu": "3.17.0", + "@tensorflow/tfjs-backend-webgl": "3.17.0", + "@tensorflow/tfjs-converter": "3.17.0", + "@tensorflow/tfjs-core": "3.17.0", + "@tensorflow/tfjs-data": "3.17.0", + "@tensorflow/tfjs-layers": "3.17.0", "argparse": "^1.0.10", "chalk": "^4.1.0", "core-js": "3", @@ -9231,29 +9261,29 @@ } }, "@tensorflow/tfjs-backend-cpu": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-3.15.0.tgz", - "integrity": "sha512-f+GREHSiVkVIpFAwkjB7YWcZefqQvCKQhrNjZzm1WX4VdnWlo0b1lTI+gPIIYNk4LEFMBNJbfqy/N1xNS/SOLQ==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-cpu/-/tfjs-backend-cpu-3.17.0.tgz", + "integrity": "sha512-alfmaPLnsa/DvkhnPoX/r9ZVDcSuRZUJEElaG3o84JrCBOqzq2jcFwaT9KxchN8rDLmKjJMLQkcQx/bSp/Oz4w==", "requires": { "@types/seedrandom": "2.4.27", "seedrandom": "2.4.3" } }, "@tensorflow/tfjs-backend-wasm": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-wasm/-/tfjs-backend-wasm-3.15.0.tgz", - "integrity": "sha512-Oohpk0hOvMPabBqe3NyTS7/oZy2dcsALMGlsaz7t5bJNxEVOambHsrcEtD5qbmQcuVBITArutF2myO8cV1QeHA==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-wasm/-/tfjs-backend-wasm-3.17.0.tgz", + "integrity": "sha512-hfh4VpYr0C1Qu1uuO2SQH4WuX62OdDkg2e5/rFFgyjMg/avf94udgXtvkD2f4VUMwsoiZk1p40+rZCCnoCBB2A==", "requires": { - "@tensorflow/tfjs-backend-cpu": "3.15.0", + "@tensorflow/tfjs-backend-cpu": "3.17.0", "@types/emscripten": "~0.0.34" } }, "@tensorflow/tfjs-backend-webgl": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-3.15.0.tgz", - "integrity": "sha512-QOxbTABFbP+m+UmCVB8VQlmZbsXiJOP8QRkRRZHhGWNKjtT3eWi+ROS1tbloS7/Q20SEmNZXCvcsjv0TBgFQPw==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-backend-webgl/-/tfjs-backend-webgl-3.17.0.tgz", + "integrity": "sha512-OC/IvU4TNx+B0J51kzCvSPWrC5qXtjY2aAsUvqXb9edhSMwrhC0sSS64t+KuIuPbNiAlVqPvlWZDz3WKPiIPdA==", "requires": { - "@tensorflow/tfjs-backend-cpu": "3.15.0", + "@tensorflow/tfjs-backend-cpu": "3.17.0", "@types/offscreencanvas": "~2019.3.0", "@types/seedrandom": "2.4.27", "@types/webgl-ext": "0.0.30", @@ -9262,37 +9292,38 @@ } }, "@tensorflow/tfjs-converter": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-converter/-/tfjs-converter-3.15.0.tgz", - "integrity": "sha512-FBk3qGvNfS1xCw+ZLXCiD72vpR/rZaShFOY7HmLtTTfWlebWowrjaNqjvO8SKc7UGtRR/GJ7Bf3TgKyr9D3g0Q==" + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-converter/-/tfjs-converter-3.17.0.tgz", + "integrity": "sha512-AlnIg7aKtfiFq7/ZrWDsVgaw82Uig2KLJY2MOAwadpI4OqhKwwArFHVbVBiOhAEHmp6obwwYaGtItmSM+dzlUQ==" }, "@tensorflow/tfjs-core": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-core/-/tfjs-core-3.15.0.tgz", - "integrity": "sha512-X1XGr8rewm/n0RDMnaLRcRYsTHlQCqQUR5DCtjUf4TuII7kq/pkZ9xCKPPfS1qUd5jLy663h8j5cAyjJNUt/hw==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-core/-/tfjs-core-3.17.0.tgz", + "integrity": "sha512-PMqEDysVy3WsSK4pU+UaoINRjps1RTF2CPvS1sWgOJqc/rUz8mSMibMosti0Is6DHGw7UiAq53y9VMuzQRVJqA==", "requires": { "@types/long": "^4.0.1", "@types/offscreencanvas": "~2019.3.0", "@types/seedrandom": "2.4.27", "@types/webgl-ext": "0.0.30", + "@webgpu/types": "^0.1.16", "long": "4.0.0", "node-fetch": "~2.6.1", "seedrandom": "2.4.3" } }, "@tensorflow/tfjs-data": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-data/-/tfjs-data-3.15.0.tgz", - "integrity": "sha512-x8JOhpIsqN9jIWZqEmt2vLYf49lIhekI6nyw/fgAKjtx+I4qKw2gY7/r11TewZRxyD2o7SOrSoNIZT8nQJ5YfQ==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-data/-/tfjs-data-3.17.0.tgz", + "integrity": "sha512-RgsdrGzWaQtxlRnk7Yiz8ebxbFfgNLITaFri6WxSPNZFI5ajLtw/daxp04ij9l1MIUJeJYgaKeMVXFvJwy8TAQ==", "requires": { "@types/node-fetch": "^2.1.2", "node-fetch": "~2.6.1" } }, "@tensorflow/tfjs-layers": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-layers/-/tfjs-layers-3.15.0.tgz", - "integrity": "sha512-6MWTrRd+kK2rto/HXX0Gg9yGIkT0twvuzTHcxFHUJVlW3JYulRCp185h3AcBytyzqQeae5eA73aOovm3lBvN+A==" + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@tensorflow/tfjs-layers/-/tfjs-layers-3.17.0.tgz", + "integrity": "sha512-SXx6k1va/RfiCmwaglbaN/eQzZ33xhCUZgk5zpRJkxk3Gx9xXRHb05HszM0BH+cokwmueWcJQpRjcnvjdKxtUg==" }, "@tootallnate/once": { "version": "1.1.2", @@ -9363,9 +9394,9 @@ } }, "@types/long": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", - "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz", + "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==" }, "@types/minimatch": { "version": "3.0.5", @@ -9427,6 +9458,11 @@ "@types/node": "*" } }, + "@webgpu/types": { + "version": "0.1.16", + "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.16.tgz", + "integrity": "sha512-9E61voMP4+Rze02jlTXud++Htpjyyk8vw5Hyw9FGRrmhHQg2GqbuOfwf5Klrb8vTxc2XWI3EfO7RUHMpxTj26A==" + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -9606,11 +9642,24 @@ "dev": true }, "axios": { - "version": "0.26.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", - "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", + "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", "requires": { - "follow-redirects": "^1.14.8" + "follow-redirects": "^1.14.9", + "form-data": "^4.0.0" + }, + "dependencies": { + "form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + } } }, "balanced-match": { @@ -10261,9 +10310,9 @@ } }, "electron": { - "version": "18.0.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-18.0.4.tgz", - "integrity": "sha512-xfsozNpFr3WzeM1EFlw2qqiqXbCrgQNBJJMlcC4/DUYVpkF8364SZenX7FFFA42NmwXiOEahkvvho/u7UrAcGg==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/electron/-/electron-18.2.3.tgz", + "integrity": "sha512-DJWX03hCRKTscsfXxmW4gmgFuseop+g+m4ml7NfOMfankD8uYyr2Xyi3Ui02inL9qZOlbLMeLVCu6jKCKs8p/w==", "dev": true, "requires": { "@electron/get": "^1.13.0", @@ -11261,9 +11310,9 @@ } }, "follow-redirects": { - "version": "1.14.8", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", - "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==" + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" }, "forever-agent": { "version": "0.6.1", @@ -12558,9 +12607,9 @@ "dev": true }, "nodemailer": { - "version": "6.7.3", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.3.tgz", - "integrity": "sha512-KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g==" + "version": "6.7.5", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.5.tgz", + "integrity": "sha512-6VtMpwhsrixq1HDYSBBHvW0GwiWawE75dS3oal48VqRhUvKJNnKnJo2RI/bCVQubj1vgrgscMNW4DHaD6xtMCg==" }, "nopt": { "version": "5.0.0", diff --git a/package.json b/package.json index e060593..6545dc5 100644 --- a/package.json +++ b/package.json @@ -27,19 +27,19 @@ "@electron-forge/maker-rpm": "^6.0.0-beta.63", "@electron-forge/maker-squirrel": "6.0.0-beta.33", "@electron-forge/maker-zip": "^6.0.0-beta.63", - "electron": "^18.0.4", + "electron": "^18.2.3", "electron-rebuild": "^3.2.7" }, "dependencies": { - "@ocogeclub/pigpio": "file:local_modules/@ocogeclub/pigpio", + "@ocoge.club/pigpio": "file:local_modules/@ocoge.club/pigpio", "@tensorflow-models/blazeface": "^0.0.7", "@tensorflow-models/knn-classifier": "^1.2.4", "@tensorflow-models/mobilenet": "^2.1.0", - "@tensorflow/tfjs": "^3.15.0", - "@tensorflow/tfjs-backend-wasm": "^3.15.0", - "axios": "^0.26.1", + "@tensorflow/tfjs": "^3.17.0", + "@tensorflow/tfjs-backend-wasm": "^3.17.0", + "axios": "^0.27.2", "electron-squirrel-startup": "^1.0.0", - "nodemailer": "^6.7.3", + "nodemailer": "^6.7.5", "tensorset": "^1.2.9" }, "config": { @@ -66,7 +66,7 @@ "Development" ], "icon": "./icon.png", - "maintainer": "ICHIJU-INN " + "maintainer": "ocogeclub " } } } diff --git a/ugj_blocks.js b/ugj_blocks.js index 71a0a27..790ea83 100644 --- a/ugj_blocks.js +++ b/ugj_blocks.js @@ -261,7 +261,7 @@ Blockly.Blocks['ugj_gpio_open'] = { }; Blockly.JavaScript['ugj_gpio_open'] = function (block) { Blockly.JavaScript.provideFunction_( - 'require_gpio', [`const _pi = require('@ocogeclub/` + elutil.gpio_backend + `');`] + 'require_gpio', [`const _pi = require('@ocoge.club/` + elutil.gpio_backend + `');`] ); var code = `await _pi.gpio_open();\n`; // return code; @@ -613,7 +613,7 @@ Blockly.JavaScript['ugj_serial_open'] = function (block) { // var value_tty = Blockly.JavaScript.valueToCode(block, 'tty', Blockly.JavaScript.ORDER_ATOMIC); var dropdown_baud = block.getFieldValue('baud'); Blockly.JavaScript.provideFunction_( - 'require_gpio', [`const _pi = require('@ocogeclub/` + elutil.gpio_backend + `');`] + 'require_gpio', [`const _pi = require('@ocoge.club/` + elutil.gpio_backend + `');`] ); var code = `await _pi.serial_open('/dev/serial0', ${dropdown_baud});\n`; return code; @@ -753,7 +753,7 @@ Blockly.Blocks['ugj_i2c_open'] = { Blockly.JavaScript['ugj_i2c_open'] = function (block) { var value_i2c_address = Blockly.JavaScript.valueToCode(block, 'i2c_address', Blockly.JavaScript.ORDER_ATOMIC); Blockly.JavaScript.provideFunction_( - 'require_gpio', [`const _pi = require('@ocogeclub/` + elutil.gpio_backend + `');`] + 'require_gpio', [`const _pi = require('@ocoge.club/` + elutil.gpio_backend + `');`] ); var code = `await _pi.i2c_open(${elutil.i2c_bus}, ${value_i2c_address});\n`; return code; @@ -2833,4 +2833,4 @@ Blockly.JavaScript['testblock'] = function (block) { // TODO: Assemble JavaScript into code variable. var code = `${value_foo} = 42;\n`; return code; -}; \ No newline at end of file +};