iobroker.javascript 7.10.2 → 7.11.1

package/README.md

@@ -42,6 +42,21 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
 <!--
 	### **WORK IN PROGRESS**
 -->
+### 7.11.1 (2024-03-28)
+
+* (klein0r) Added exec result blockly block
+* (klein0r) Protect iobroker-data/files to avoid direct writes with node:fs
+* (klein0r) Escape single quotes in blockly obj attributes
+
+### 7.11.0 (2024-03-26)
+
+* (klein0r) Added blockly block for read and write file
+* (klein0r) Allow to select other object types than state in some blocks
+* (klein0r) Improved translations
+* (klein0r) Removed 'type' from dropdown (is always 'state')
+* (klein0r) Use highlight in search (instead of select)
+* (klein0r) Added option for httpGet to receive arraybuffer (download files)
+
 ### 7.10.2 (2024-03-25)
 
 * (klein0r) Fixed httpGet/httpPost issue when using without options
@@ -58,16 +73,6 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
 * (klein0r) Copy date object in getAstroDate
 * (klein0r) Added object id as tooltip
 
-### 7.9.4 (2024-03-20)
-
-* (klein0r) Fixed urlencoding for basic auth in url (user:pass)
-* (klein0r) Added warning icon if trigger is positioned inside of another trigger or loop
-
-### 7.9.3 (2024-03-19)
-
-* (klein0r) Added timeout option for http blocks
-* (klein0r) Added option for basic auth in url (user:pass)
-
 ## License
 The MIT License (MIT)
 

package/admin/asset-manifest.json

@@ -1,8 +1,8 @@
 {
   "files": {
-    "main.js": "/static/js/main.4caef13e.js",
+    "main.js": "/static/js/main.f0e610b0.js",
     "static/css/184.7463f8b6.chunk.css": "/static/css/184.7463f8b6.chunk.css",
-    "static/js/184.23703866.chunk.js": "/static/js/184.23703866.chunk.js",
+    "static/js/184.985be7e8.chunk.js": "/static/js/184.985be7e8.chunk.js",
     "static/js/966.088c1225.chunk.js": "/static/js/966.088c1225.chunk.js",
     "static/js/30.8bf17a3b.chunk.js": "/static/js/30.8bf17a3b.chunk.js",
     "static/js/704.4ede9892.chunk.js": "/static/js/704.4ede9892.chunk.js",
@@ -160,9 +160,9 @@
     "static/media/Garage Doors.svg": "/static/media/Garage Doors.0c2a1cfca7ad1ea59625.svg",
     "static/media/Outdoor Blinds.svg": "/static/media/Outdoor Blinds.37b85a9c060a4af48da9.svg",
     "static/media/Upstairs.svg": "/static/media/Upstairs.441813e54e0daca0882d.svg",
-    "main.4caef13e.js.map": "/static/js/main.4caef13e.js.map",
+    "main.f0e610b0.js.map": "/static/js/main.f0e610b0.js.map",
     "184.7463f8b6.chunk.css.map": "/static/css/184.7463f8b6.chunk.css.map",
-    "184.23703866.chunk.js.map": "/static/js/184.23703866.chunk.js.map",
+    "184.985be7e8.chunk.js.map": "/static/js/184.985be7e8.chunk.js.map",
     "966.088c1225.chunk.js.map": "/static/js/966.088c1225.chunk.js.map",
     "30.8bf17a3b.chunk.js.map": "/static/js/30.8bf17a3b.chunk.js.map",
     "704.4ede9892.chunk.js.map": "/static/js/704.4ede9892.chunk.js.map",
@@ -195,6 +195,6 @@
     "77.f4bb7c45.chunk.js.map": "/static/js/77.f4bb7c45.chunk.js.map"
   },
   "entrypoints": [
-    "static/js/main.4caef13e.js"
+    "static/js/main.f0e610b0.js"
   ]
 }

package/admin/google-blockly/own/blocks_action.js

@@ -20,7 +20,7 @@ Blockly.Action.blocks['exec'] =
     '<block type="exec">'
     + '     <value name="COMMAND">'
     + '         <shadow type="text">'
-    + '             <field name="TEXT">text</field>'
+    + '             <field name="TEXT">pwd</field>'
     + '         </shadow>'
     + '     </value>'
     + '     <value name="LOG">'
@@ -33,7 +33,7 @@ Blockly.Action.blocks['exec'] =
 Blockly.Blocks['exec'] = {
     init: function() {
         this.appendDummyInput('TEXT')
-            .appendField(Blockly.Translate('exec'));
+            .appendField('» ' + Blockly.Translate('exec'));
 
         this.appendValueInput('COMMAND')
             .appendField(Blockly.Translate('exec_command'));
@@ -96,7 +96,7 @@ Blockly.JavaScript['exec'] = function(block) {
 
     let logText;
     if (logLevel) {
-        logText = 'console.' + logLevel + '("exec: " + ' + value_command + ');\n'
+        logText = `console.${logLevel}('exec: ' + ${value_command});\n`;
     } else {
         logText = '';
     }
@@ -104,18 +104,83 @@ Blockly.JavaScript['exec'] = function(block) {
     if (withStatement === 'TRUE' || withStatement === 'true' || withStatement === true) {
         const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
         if (statement) {
-            return 'exec(' + value_command + ', async (error, result, stderr) => {\n' + statement + '});\n' +
-                logText;
+            return `exec(${value_command}, async (error, result, stderr) => {\n` +
+                statement +
+                `});\n${logText}`;
         } else {
-            return 'exec(' + value_command + ');\n' +
-                logText;
+            return `exec(${value_command});\n${logText}`;
         }
     } else {
-        return 'exec(' + value_command + ');\n' +
-            logText;
+        return `exec(${value_command});\n${logText}`;
     }
 };
 
+// --- exec_result -----------------------------------------------------------
+Blockly.Action.blocks['exec_result'] =
+    '<block type="exec_result">'
+    + '     <value name="ATTR">'
+    + '     </value>'
+    + '</block>';
+
+Blockly.Blocks['exec_result'] = {
+    /**
+     * Block for conditionally returning a value from a procedure.
+     * @this Blockly.Block
+     */
+    init: function() {
+        this.appendDummyInput()
+            .appendField('»');
+
+        this.appendDummyInput('ATTR')
+            .appendField(new Blockly.FieldDropdown([
+                [Blockly.Translate('exec_result_result'), 'result'],
+                [Blockly.Translate('exec_result_stderr'), 'stderr'],
+                [Blockly.Translate('exec_result_error'), 'error'],
+            ]), 'ATTR');
+
+        this.setInputsInline(true);
+        this.setOutput(true);
+        this.setColour(Blockly.Action.HUE);
+        this.setTooltip(Blockly.Translate('exec_result_tooltip'));
+        //this.setHelpUrl(getHelp('exec'));
+    },
+    /**
+     * Called whenever anything on the workspace changes.
+     * Add warning if this flow block is not nested inside a loop.
+     * @param {!Blockly.Events.Abstract} e Change event.
+     * @this Blockly.Block
+     */
+    onchange: function(e) {
+        let legal = false;
+        // Is the block nested in an exec?
+        let block = this;
+        do {
+            if (this.FUNCTION_TYPES.includes(block.type)) {
+                legal = true;
+                break;
+            }
+            block = block.getSurroundParent();
+        } while (block);
+
+        if (legal) {
+            this.setWarningText(null, this.id);
+        } else {
+            this.setWarningText(Blockly.Translate('exec_result_warning'), this.id);
+        }
+    },
+    /**
+     * List of block types that are functions and thus do not need warnings.
+     * To add a new function type add this to your code:
+     * Blockly.Blocks['procedures_ifreturn'].FUNCTION_TYPES.push('custom_func');
+     */
+    FUNCTION_TYPES: ['exec'],
+};
+Blockly.JavaScript['exec_result'] = function(block) {
+    const attr = block.getFieldValue('ATTR');
+
+    return [attr, Blockly.JavaScript.ORDER_ATOMIC];
+};
+
 // --- action http_get --------------------------------------------------
 Blockly.Action.blocks['http_get'] =
     '<block type="http_get">'
@@ -128,6 +193,8 @@ Blockly.Action.blocks['http_get'] =
     + '     </value>'
     + '     <value name="UNIT">'
     + '     </value>'
+    + '     <value name="TYPE">'
+    + '     </value>'
     + '     <value name="STATEMENT">'
     + '     </value>'
     + '</block>';
@@ -135,16 +202,23 @@ Blockly.Action.blocks['http_get'] =
 Blockly.Blocks['http_get'] = {
     init: function() {
         this.appendValueInput('URL')
-            .appendField(Blockly.Translate('http_get'));
+            .appendField('🌐 ' + Blockly.Translate('http_get'));
 
         this.appendDummyInput()
-            .appendField(Blockly.Translate('http_get_timeout'))
+            .appendField(Blockly.Translate('http_timeout'))
             .appendField(new Blockly.FieldTextInput(2000), 'TIMEOUT')
             .appendField(new Blockly.FieldDropdown([
-                [Blockly.Translate('http_get_settimeout_ms'), 'ms'],
-                [Blockly.Translate('http_get_settimeout_sec'), 'sec']
+                [Blockly.Translate('http_timeout_ms'), 'ms'],
+                [Blockly.Translate('http_timeout_sec'), 'sec']
             ]), 'UNIT');
 
+        this.appendDummyInput('TYPE')
+            .appendField(Blockly.Translate('http_type'))
+            .appendField(new Blockly.FieldDropdown([
+                [Blockly.Translate('http_type_text'),  'text'],
+                [Blockly.Translate('http_type_arraybuffer'), 'arraybuffer'],
+            ]), 'TYPE');
+
         this.appendStatementInput('STATEMENT')
             .setCheck(null);
 
@@ -170,7 +244,12 @@ Blockly.JavaScript['http_get'] = function(block) {
         timeout *= 1000;
     }
 
-    return `httpGet(${URL}, { timeout: ${timeout} }, async (err, response) => {\n` +
+    let responseType = block.getFieldValue('TYPE');
+    if (!responseType) {
+        responseType = 'text';
+    }
+
+    return `httpGet(${URL}, { timeout: ${timeout}, responseType: '${responseType}' }, async (err, response) => {\n` +
         Blockly.JavaScript.prefixLines(`if (err) {`, Blockly.JavaScript.INDENT) + '\n' +
         Blockly.JavaScript.prefixLines(`console.error(err);`, Blockly.JavaScript.INDENT + Blockly.JavaScript.INDENT) + '\n' +
         Blockly.JavaScript.prefixLines(`}`, Blockly.JavaScript.INDENT) + '\n' +
@@ -190,6 +269,8 @@ Blockly.Action.blocks['http_post'] =
     + '     </value>'
     + '     <value name="UNIT">'
     + '     </value>'
+    + '     <value name="TYPE">'
+    + '     </value>'
     + '     <value name="DATA">'
     + '         <shadow type="object_new">'
     + '         </shadow>'
@@ -201,16 +282,23 @@ Blockly.Action.blocks['http_post'] =
 Blockly.Blocks['http_post'] = {
     init: function() {
         this.appendValueInput('URL')
-            .appendField(Blockly.Translate('http_post'));
+            .appendField('🌐 ' + Blockly.Translate('http_post'));
 
         this.appendDummyInput()
-            .appendField(Blockly.Translate('http_post_timeout'))
+            .appendField(Blockly.Translate('http_timeout'))
             .appendField(new Blockly.FieldTextInput(2000), 'TIMEOUT')
             .appendField(new Blockly.FieldDropdown([
-                [Blockly.Translate('http_post_settimeout_ms'), 'ms'],
-                [Blockly.Translate('http_post_settimeout_sec'), 'sec']
+                [Blockly.Translate('http_timeout_ms'), 'ms'],
+                [Blockly.Translate('http_timeout_sec'), 'sec']
             ]), 'UNIT');
 
+        this.appendDummyInput('TYPE')
+            .appendField(Blockly.Translate('http_type'))
+            .appendField(new Blockly.FieldDropdown([
+                [Blockly.Translate('http_type_text'),  'text'],
+                [Blockly.Translate('http_type_arraybuffer'), 'arraybuffer'],
+            ]), 'TYPE');
+
         this.appendValueInput('DATA')
             .appendField(Blockly.Translate('http_post_data'));
 
@@ -240,11 +328,16 @@ Blockly.JavaScript['http_post'] = function(block) {
         timeout *= 1000;
     }
 
+    let responseType = block.getFieldValue('TYPE');
+    if (!responseType) {
+        responseType = 'text';
+    }
+
     if (!data) {
         data = 'null';
     }
 
-    return `httpPost(${URL}, ${data}, { timeout: ${timeout} }, async (err, response) => {\n` +
+    return `httpPost(${URL}, ${data}, { timeout: ${timeout}, responseType: '${responseType}' }, async (err, response) => {\n` +
         Blockly.JavaScript.prefixLines(`if (err) {`, Blockly.JavaScript.INDENT) + '\n' +
         Blockly.JavaScript.prefixLines(`console.error(err);`, Blockly.JavaScript.INDENT + Blockly.JavaScript.INDENT) + '\n' +
         Blockly.JavaScript.prefixLines(`}`, Blockly.JavaScript.INDENT) + '\n' +
@@ -252,7 +345,7 @@ Blockly.JavaScript['http_post'] = function(block) {
         '});\n';
 };
 
-// --- get info about event -----------------------------------------------------------
+// --- http_response -----------------------------------------------------------
 Blockly.Action.blocks['http_response'] =
     '<block type="http_response">'
     + '     <value name="ATTR">'
@@ -276,7 +369,7 @@ Blockly.Blocks['http_response'] = {
 
         this.setInputsInline(true);
         this.setOutput(true);
-        this.setColour(Blockly.Trigger.HUE);
+        this.setColour(Blockly.Action.HUE);
         this.setTooltip(Blockly.Translate('http_response_tooltip'));
         //this.setHelpUrl(getHelp('http_response'));
     },
@@ -317,6 +410,196 @@ Blockly.JavaScript['http_response'] = function(block) {
     return [attr, Blockly.JavaScript.ORDER_ATOMIC];
 };
 
+// --- action file_write --------------------------------------------------
+Blockly.Action.blocks['file_write'] =
+    '<block type="file_write">'
+    + '     <value name="OID">'
+    + '         <shadow type="field_oid_meta">'
+    + '             <field name="oid">0_userdata.0</field>'
+    + '         </shadow>'
+    + '     </value>'
+    + '     <value name="FILE">'
+    + '         <shadow type="text">'
+    + '             <field name="TEXT">demo.json</field>'
+    + '         </shadow>'
+    + '     </value>'
+    + '     <value name="DATA">'
+    + '     </value>'
+    + '</block>';
+
+Blockly.Blocks['file_write'] = {
+    init: function() {
+        this.appendValueInput('OID')
+            .appendField('📁 ' + Blockly.Translate('file_write'));
+
+        this.appendValueInput('FILE')
+            .appendField(Blockly.Translate('file_write_filename'))
+            .setCheck(null);
+
+        this.appendValueInput('DATA')
+            .appendField(Blockly.Translate('file_write_data'));
+
+        this.setInputsInline(false);
+        this.setPreviousStatement(true, null);
+        this.setNextStatement(true, null);
+
+        this.setColour(Blockly.Action.HUE);
+        this.setTooltip(Blockly.Translate('file_write_tooltip'));
+        this.setHelpUrl(getHelp('file_write_help'));
+    }
+};
+
+Blockly.JavaScript['file_write'] = function(block) {
+    const value_objectid = Blockly.JavaScript.valueToCode(block, 'OID', Blockly.JavaScript.ORDER_ATOMIC);
+    const file = Blockly.JavaScript.valueToCode(block, 'FILE', Blockly.JavaScript.ORDER_ATOMIC);
+    const data = Blockly.JavaScript.valueToCode(block, 'DATA', Blockly.JavaScript.ORDER_ATOMIC);
+
+    let objectName = '';
+    try {
+        const objId = eval(value_objectid); // Code to string
+        objectName = main.objects[objId] && main.objects[objId].common && main.objects[objId].common.name ? main.objects[objId].common.name : '';
+        if (typeof objectName === 'object') {
+            objectName = objectName[systemLang] || objectName.en;
+        }
+    } catch (error) {
+        
+    }
+
+    return `writeFile(${value_objectid}${objectName ? ` /* ${objectName} */` : ''}, String(${file}), ${data ? data : 'null'}, (err) => {\n` +
+        Blockly.JavaScript.prefixLines(`if (err) {`, Blockly.JavaScript.INDENT) + '\n' +
+        Blockly.JavaScript.prefixLines(`console.error(err);`, Blockly.JavaScript.INDENT + Blockly.JavaScript.INDENT) + '\n' +
+        Blockly.JavaScript.prefixLines(`}`, Blockly.JavaScript.INDENT) + '\n' +
+        '});\n';
+};
+
+// --- action file_read --------------------------------------------------
+Blockly.Action.blocks['file_read'] =
+    '<block type="file_read">'
+    + '     <value name="OID">'
+    + '         <shadow type="field_oid_meta">'
+    + '             <field name="oid">0_userdata.0</field>'
+    + '         </shadow>'
+    + '     </value>'
+    + '     <value name="FILE">'
+    + '         <shadow type="text">'
+    + '             <field name="TEXT">demo.json</field>'
+    + '         </shadow>'
+    + '     </value>'
+    + '     <value name="STATEMENT">'
+    + '     </value>'
+    + '</block>';
+
+Blockly.Blocks['file_read'] = {
+    init: function() {
+        this.appendValueInput('OID')
+            .appendField('📁 ' + Blockly.Translate('file_read'));
+
+        this.appendValueInput('FILE')
+            .appendField(Blockly.Translate('file_read_filename'))
+            .setCheck(null);
+
+        this.appendStatementInput('STATEMENT')
+            .setCheck(null);
+
+        this.setInputsInline(false);
+        this.setPreviousStatement(true, null);
+        this.setNextStatement(true, null);
+
+        this.setColour(Blockly.Action.HUE);
+        this.setTooltip(Blockly.Translate('file_read_tooltip'));
+        this.setHelpUrl(getHelp('file_read_help'));
+    }
+};
+
+Blockly.JavaScript['file_read'] = function(block) {
+    const value_objectid = Blockly.JavaScript.valueToCode(block, 'OID', Blockly.JavaScript.ORDER_ATOMIC);
+    const file = Blockly.JavaScript.valueToCode(block, 'FILE', Blockly.JavaScript.ORDER_ATOMIC);
+    const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
+
+    let objectName = '';
+    try {
+        const objId = eval(value_objectid); // Code to string
+        objectName = main.objects[objId] && main.objects[objId].common && main.objects[objId].common.name ? main.objects[objId].common.name : '';
+        if (typeof objectName === 'object') {
+            objectName = objectName[systemLang] || objectName.en;
+        }
+    } catch (error) {
+        
+    }
+
+    return `readFile(${value_objectid}${objectName ? ` /* ${objectName} */` : ''}, String(${file}), (err, data, mimeType) => {\n` +
+        Blockly.JavaScript.prefixLines(`if (err) {`, Blockly.JavaScript.INDENT) + '\n' +
+        Blockly.JavaScript.prefixLines(`console.error(err);`, Blockly.JavaScript.INDENT + Blockly.JavaScript.INDENT) + '\n' +
+        Blockly.JavaScript.prefixLines(`}`, Blockly.JavaScript.INDENT) + '\n' +
+        statement +
+        '});\n';
+};
+
+// --- file_data -----------------------------------------------------------
+Blockly.Action.blocks['file_data'] =
+    '<block type="file_data">'
+    + '     <value name="ATTR">'
+    + '     </value>'
+    + '</block>';
+
+Blockly.Blocks['file_data'] = {
+    /**
+     * Block for conditionally returning a value from a procedure.
+     * @this Blockly.Block
+     */
+    init: function() {
+        this.appendDummyInput()
+            .appendField('📁');
+
+        this.appendDummyInput('ATTR')
+            .appendField(new Blockly.FieldDropdown([
+                [Blockly.Translate('file_data_data'), 'data'],
+                [Blockly.Translate('file_data_mimeType'), 'mimeType'],
+            ]), 'ATTR');
+
+        this.setInputsInline(true);
+        this.setOutput(true);
+        this.setColour(Blockly.Action.HUE);
+        this.setTooltip(Blockly.Translate('file_data_tooltip'));
+        //this.setHelpUrl(getHelp('file_data'));
+    },
+    /**
+     * Called whenever anything on the workspace changes.
+     * Add warning if this flow block is not nested inside a loop.
+     * @param {!Blockly.Events.Abstract} e Change event.
+     * @this Blockly.Block
+     */
+    onchange: function(e) {
+        let legal = false;
+        // Is the block nested in a trigger?
+        let block = this;
+        do {
+            if (this.FUNCTION_TYPES.includes(block.type)) {
+                legal = true;
+                break;
+            }
+            block = block.getSurroundParent();
+        } while (block);
+
+        if (legal) {
+            this.setWarningText(null, this.id);
+        } else {
+            this.setWarningText(Blockly.Translate('file_data_warning'), this.id);
+        }
+    },
+    /**
+     * List of block types that are functions and thus do not need warnings.
+     * To add a new function type add this to your code:
+     * Blockly.Blocks['procedures_ifreturn'].FUNCTION_TYPES.push('custom_func');
+     */
+    FUNCTION_TYPES: ['file_read'],
+};
+Blockly.JavaScript['file_data'] = function(block) {
+    const attr = block.getFieldValue('ATTR');
+
+    return [attr, Blockly.JavaScript.ORDER_ATOMIC];
+};
+
 // --- action request --------------------------------------------------
 Blockly.Action.blocks['request'] =
     '<block type="request">'
@@ -403,7 +686,7 @@ Blockly.JavaScript['request'] = function(block) {
         logText = '';
     }
 
-    logText += `console.warn('request blockly block is deprecated - please use "http get" instead');\n`;
+    logText += `console.warn('request blockly block is deprecated - please use "http (GET)" instead');\n`;
 
     if (withStatement === 'TRUE' || withStatement === 'true' || withStatement === true) {
         const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');

package/admin/google-blockly/own/blocks_object.js

@@ -229,7 +229,7 @@ Blockly.JavaScript['object_new'] = function(block) {
     for (let n = 0; n < block.itemCount_; n++) {
         const val = Blockly.JavaScript.valueToCode(block, 'ATTR_' + n, Blockly.JavaScript.ORDER_COMMA);
         if (val) {
-            attributes.push(`'${block.attributes_[n]}': ${val}`);
+            attributes.push(`'${String(block.attributes_[n]).replaceAll(`'`, `\\'`)}': ${val}`);
         }
     }
 
@@ -282,7 +282,7 @@ Blockly.JavaScript['object_set_attr'] = function(block) {
         obj = '{}';
     }
 
-    return `(() => { const obj = ${obj}; if (typeof obj === 'object') { obj['${attr}'] = ${value}; } })();\n`;
+    return `((obj) => { if (typeof obj === 'object') { obj['${attr}'] = ${value}; } })(${obj});\n`;
 };
 
 // --- delete attribute --------------------------------------------------
@@ -321,7 +321,7 @@ Blockly.JavaScript['object_del_attr'] = function(block) {
         obj = '{}';
     }
 
-    return `(() => { const obj = ${obj}; if (typeof obj === 'object') { delete obj['${attr}']; } })();\n`;
+    return `((obj) => { if (typeof obj === 'object') { delete obj['${attr}']; } })(${obj});\n`;
 };
 
 // --- has attribute --------------------------------------------------

package/admin/google-blockly/own/blocks_system.js

@@ -102,7 +102,7 @@ Blockly.Blocks['control'] = {
             .appendField(Blockly.Translate('control'));
 
         this.appendDummyInput('OID')
-            .appendField(new Blockly.FieldOID('Object ID'), 'OID');
+            .appendField(new Blockly.FieldOID(Blockly.Translate('select_id'), 'state'), 'OID');
 
         this.appendValueInput('VALUE')
             .setCheck(null)
@@ -222,7 +222,7 @@ Blockly.Blocks['toggle'] = {
             .appendField(Blockly.Translate('toggle'));
 
         this.appendDummyInput('OID')
-            .appendField(new Blockly.FieldOID('Object ID'), 'OID');
+            .appendField(new Blockly.FieldOID(Blockly.Translate('select_id'), 'state'), 'OID');
 
         this.appendDummyInput('WITH_DELAY')
             .appendField(Blockly.Translate('toggle_delay'))
@@ -362,7 +362,7 @@ Blockly.Blocks['update'] = {
             .appendField(Blockly.Translate('update'));
 
         this.appendDummyInput('OID')
-            .appendField(new Blockly.FieldOID('Object ID'), 'OID');
+            .appendField(new Blockly.FieldOID(Blockly.Translate('select_id'), 'state'), 'OID');
 
         this.appendValueInput('VALUE')
             .setCheck(null)
@@ -775,7 +775,6 @@ Blockly.Blocks['get_value'] = {
                 [Blockly.Translate('get_common_unit'),   'common.unit'],
                 [Blockly.Translate('get_common_role'),   'common.role'],
                 [Blockly.Translate('get_common_state_type'), 'common.type'],
-                [Blockly.Translate('get_common_object_type'), 'type'],
                 [Blockly.Translate('get_common_read'),    'common.read'],
                 [Blockly.Translate('get_common_write'),   'common.write'],
             ]), 'ATTR');
@@ -784,7 +783,7 @@ Blockly.Blocks['get_value'] = {
             .appendField(Blockly.Translate('get_value_OID'));
 
         this.appendDummyInput()
-            .appendField(new Blockly.FieldOID(Blockly.Translate('get_value_default')), 'OID');
+            .appendField(new Blockly.FieldOID(Blockly.Translate('select_id'), 'state'), 'OID');
 
         this.setInputsInline(true);
         this.setOutput(true);
@@ -849,7 +848,6 @@ Blockly.Blocks['get_value_var'] = {
                 [Blockly.Translate('get_common_unit'),   'common.unit'],
                 [Blockly.Translate('get_common_role'),   'common.role'],
                 [Blockly.Translate('get_common_state_type'), 'common.type'],
-                [Blockly.Translate('get_common_object_type'), 'type'],
                 [Blockly.Translate('get_common_read'),    'common.read'],
                 [Blockly.Translate('get_common_write'),   'common.write'],
             ]), 'ATTR');
@@ -922,7 +920,6 @@ Blockly.Blocks['get_value_async'] = {
                 [Blockly.Translate('get_common_unit'),   'common.unit'],
                 [Blockly.Translate('get_common_role'),   'common.role'],
                 [Blockly.Translate('get_common_state_type'), 'common.type'],
-                [Blockly.Translate('get_common_object_type'), 'type'],
                 [Blockly.Translate('get_common_read'),    'common.read'],
                 [Blockly.Translate('get_common_write'),   'common.write'],
             ]), 'ATTR');
@@ -931,7 +928,7 @@ Blockly.Blocks['get_value_async'] = {
             .appendField(Blockly.Translate('get_value_OID'));
 
         this.appendDummyInput()
-            .appendField(new Blockly.FieldOID(Blockly.Translate('get_value_default')), 'OID');
+            .appendField(new Blockly.FieldOID(Blockly.Translate('select_id'), 'state'), 'OID');
 
         this.appendStatementInput('STATEMENT')
             .setCheck(null);
@@ -978,7 +975,7 @@ Blockly.Blocks['get_object'] = {
             .appendField(Blockly.Translate('get_object'));
 
         this.appendDummyInput()
-            .appendField(new Blockly.FieldOID(Blockly.Translate('get_object_default')), 'OID');
+            .appendField(new Blockly.FieldOID(Blockly.Translate('select_id'), 'all'), 'OID');
 
         this.setInputsInline(true);
         this.setOutput(true);
@@ -1024,7 +1021,7 @@ Blockly.Blocks['get_object_async'] = {
             .appendField(Blockly.Translate('get_object'));
 
         this.appendDummyInput()
-            .appendField(new Blockly.FieldOID(Blockly.Translate('get_object_default')), 'OID');
+            .appendField(new Blockly.FieldOID(Blockly.Translate('select_id'), 'all'), 'OID');
 
         this.appendStatementInput('STATEMENT')
             .setCheck(null);
@@ -1061,7 +1058,7 @@ Blockly.Blocks['field_oid'] = {
             .appendField(Blockly.Translate('field_oid_OID'));
 
         this.appendDummyInput()
-            .appendField(new Blockly.FieldOID('default'), 'oid');
+            .appendField(new Blockly.FieldOID(Blockly.Translate('select_id'), 'state'), 'oid');
 
         this.setInputsInline(true);
         this.setColour("%{BKY_TEXTS_HUE}");
@@ -1089,7 +1086,7 @@ Blockly.Blocks['field_oid_meta'] = {
             .appendField(Blockly.Translate('field_oid_OID_meta'));
 
         this.appendDummyInput()
-            .appendField(new Blockly.FieldOID('default', 'meta'), 'oid');
+            .appendField(new Blockly.FieldOID(Blockly.Translate('select_id'), 'meta'), 'oid');
 
         this.setInputsInline(true);
         this.setColour("%{BKY_TEXTS_HUE}");
@@ -1117,7 +1114,7 @@ Blockly.Blocks['field_oid_script'] = {
             .appendField(Blockly.Translate('field_oid_OID_script'));
 
         this.appendDummyInput()
-            .appendField(new Blockly.FieldOID('default', 'script'), 'oid');
+            .appendField(new Blockly.FieldOID(Blockly.Translate('select_id'), 'script'), 'oid');
 
         this.setInputsInline(true);
         this.setColour("%{BKY_TEXTS_HUE}");