@lansweeper/data-platform-outbound-grpc 0.3.31 → 0.3.32

package/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/SpecHardwareInfo.java

@@ -25,6 +25,7 @@ private static final long serialVersionUID = 0L;
     busSpeed_ = "";
     bootRomVersion_ = "";
     smcVersionSystem_ = "";
+    modelNumber_ = "";
   }
 
   @java.lang.Override
@@ -479,6 +480,65 @@ private static final long serialVersionUID = 0L;
     }
   }
 
+  public static final int MODEL_NUMBER_FIELD_NUMBER = 10;
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object modelNumber_ = "";
+  /**
+   * <pre>
+   * mac
+   * </pre>
+   *
+   * <code>optional string model_number = 10;</code>
+   * @return Whether the modelNumber field is set.
+   */
+  @java.lang.Override
+  public boolean hasModelNumber() {
+    return ((bitField0_ & 0x00000200) != 0);
+  }
+  /**
+   * <pre>
+   * mac
+   * </pre>
+   *
+   * <code>optional string model_number = 10;</code>
+   * @return The modelNumber.
+   */
+  @java.lang.Override
+  public java.lang.String getModelNumber() {
+    java.lang.Object ref = modelNumber_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      modelNumber_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * mac
+   * </pre>
+   *
+   * <code>optional string model_number = 10;</code>
+   * @return The bytes for modelNumber.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString
+      getModelNumberBytes() {
+    java.lang.Object ref = modelNumber_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      modelNumber_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
   private byte memoizedIsInitialized = -1;
   @java.lang.Override
   public final boolean isInitialized() {
@@ -520,6 +580,9 @@ private static final long serialVersionUID = 0L;
     if (((bitField0_ & 0x00000100) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, smcVersionSystem_);
     }
+    if (((bitField0_ & 0x00000200) != 0)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 10, modelNumber_);
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -557,6 +620,9 @@ private static final long serialVersionUID = 0L;
     if (((bitField0_ & 0x00000100) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, smcVersionSystem_);
     }
+    if (((bitField0_ & 0x00000200) != 0)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, modelNumber_);
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -617,6 +683,11 @@ private static final long serialVersionUID = 0L;
       if (!getSmcVersionSystem()
           .equals(other.getSmcVersionSystem())) return false;
     }
+    if (hasModelNumber() != other.hasModelNumber()) return false;
+    if (hasModelNumber()) {
+      if (!getModelNumber()
+          .equals(other.getModelNumber())) return false;
+    }
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -665,6 +736,10 @@ private static final long serialVersionUID = 0L;
       hash = (37 * hash) + SMC_VERSION_SYSTEM_FIELD_NUMBER;
       hash = (53 * hash) + getSmcVersionSystem().hashCode();
     }
+    if (hasModelNumber()) {
+      hash = (37 * hash) + MODEL_NUMBER_FIELD_NUMBER;
+      hash = (53 * hash) + getModelNumber().hashCode();
+    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -805,6 +880,7 @@ private static final long serialVersionUID = 0L;
       busSpeed_ = "";
       bootRomVersion_ = "";
       smcVersionSystem_ = "";
+      modelNumber_ = "";
       return this;
     }
 
@@ -875,6 +951,10 @@ private static final long serialVersionUID = 0L;
         result.smcVersionSystem_ = smcVersionSystem_;
         to_bitField0_ |= 0x00000100;
       }
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        result.modelNumber_ = modelNumber_;
+        to_bitField0_ |= 0x00000200;
+      }
       result.bitField0_ |= to_bitField0_;
     }
 
@@ -965,6 +1045,11 @@ private static final long serialVersionUID = 0L;
         bitField0_ |= 0x00000100;
         onChanged();
       }
+      if (other.hasModelNumber()) {
+        modelNumber_ = other.modelNumber_;
+        bitField0_ |= 0x00000200;
+        onChanged();
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -1036,6 +1121,11 @@ private static final long serialVersionUID = 0L;
               bitField0_ |= 0x00000100;
               break;
             } // case 74
+            case 82: {
+              modelNumber_ = input.readStringRequireUtf8();
+              bitField0_ |= 0x00000200;
+              break;
+            } // case 82
             default: {
               if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                 done = true; // was an endgroup tag
@@ -1796,6 +1886,109 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private java.lang.Object modelNumber_ = "";
+    /**
+     * <pre>
+     * mac
+     * </pre>
+     *
+     * <code>optional string model_number = 10;</code>
+     * @return Whether the modelNumber field is set.
+     */
+    public boolean hasModelNumber() {
+      return ((bitField0_ & 0x00000200) != 0);
+    }
+    /**
+     * <pre>
+     * mac
+     * </pre>
+     *
+     * <code>optional string model_number = 10;</code>
+     * @return The modelNumber.
+     */
+    public java.lang.String getModelNumber() {
+      java.lang.Object ref = modelNumber_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        modelNumber_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * mac
+     * </pre>
+     *
+     * <code>optional string model_number = 10;</code>
+     * @return The bytes for modelNumber.
+     */
+    public com.google.protobuf.ByteString
+        getModelNumberBytes() {
+      java.lang.Object ref = modelNumber_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        modelNumber_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * mac
+     * </pre>
+     *
+     * <code>optional string model_number = 10;</code>
+     * @param value The modelNumber to set.
+     * @return This builder for chaining.
+     */
+    public Builder setModelNumber(
+        java.lang.String value) {
+      if (value == null) { throw new NullPointerException(); }
+      modelNumber_ = value;
+      bitField0_ |= 0x00000200;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * mac
+     * </pre>
+     *
+     * <code>optional string model_number = 10;</code>
+     * @return This builder for chaining.
+     */
+    public Builder clearModelNumber() {
+      modelNumber_ = getDefaultInstance().getModelNumber();
+      bitField0_ = (bitField0_ & ~0x00000200);
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * mac
+     * </pre>
+     *
+     * <code>optional string model_number = 10;</code>
+     * @param value The bytes for modelNumber to set.
+     * @return This builder for chaining.
+     */
+    public Builder setModelNumberBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) { throw new NullPointerException(); }
+      checkByteStringIsUtf8(value);
+      modelNumber_ = value;
+      bitField0_ |= 0x00000200;
+      onChanged();
+      return this;
+    }
     @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {

package/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/SpecHardwareInfoOrBuilder.java

@@ -190,4 +190,33 @@ public interface SpecHardwareInfoOrBuilder extends
    */
   com.google.protobuf.ByteString
       getSmcVersionSystemBytes();
+
+  /**
+   * <pre>
+   * mac
+   * </pre>
+   *
+   * <code>optional string model_number = 10;</code>
+   * @return Whether the modelNumber field is set.
+   */
+  boolean hasModelNumber();
+  /**
+   * <pre>
+   * mac
+   * </pre>
+   *
+   * <code>optional string model_number = 10;</code>
+   * @return The modelNumber.
+   */
+  java.lang.String getModelNumber();
+  /**
+   * <pre>
+   * mac
+   * </pre>
+   *
+   * <code>optional string model_number = 10;</code>
+   * @return The bytes for modelNumber.
+   */
+  com.google.protobuf.ByteString
+      getModelNumberBytes();
 }

package/model/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 08 15:13:18 UTC 2024
+#Tue Nov 12 10:36:54 UTC 2024
 groupId=com.lansweeper.dp.outbound.v1
 artifactId=outbound-model
-version=0.3.30
+version=0.3.31

package/model/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -58,6 +58,7 @@ com/lansweeper/dp/outbound/v1/UpsOrBuilder.class
 com/lansweeper/dp/outbound/v1/ComputerInfrared$1.class
 com/lansweeper/dp/outbound/v1/WindowsSqlServerOrBuilder.class
 com/lansweeper/dp/outbound/v1/CatalogSoftware$1.class
+com/lansweeper/dp/outbound/v1/MacMonitorInfo$Builder.class
 com/lansweeper/dp/outbound/v1/ServerGroup.class
 com/lansweeper/dp/outbound/v1/ComputerLinuxBasicInfoOrBuilder.class
 com/lansweeper/dp/outbound/v1/SqlServerService.class
@@ -146,6 +147,7 @@ com/lansweeper/dp/outbound/v1/PcmciaController$Builder.class
 com/lansweeper/dp/outbound/v1/Ups$1.class
 com/lansweeper/dp/outbound/v1/VmwareEsxiHypervisor$Builder.class
 com/lansweeper/dp/outbound/v1/EsxiCluster$1.class
+com/lansweeper/dp/outbound/v1/MacMonitorInfo.class
 com/lansweeper/dp/outbound/v1/MacRegionalRecoveryOsSettingsOrBuilder.class
 com/lansweeper/dp/outbound/v1/SnmpInfoOrBuilder.class
 com/lansweeper/dp/outbound/v1/ComputerWindowsSerial$1.class
@@ -415,6 +417,7 @@ com/lansweeper/dp/outbound/v1/ComputerLinuxPhysicalVolumeOrBuilder.class
 com/lansweeper/dp/outbound/v1/UserInGroup$1.class
 com/lansweeper/dp/outbound/v1/SetIpLocationConfigRequest$1.class
 com/lansweeper/dp/outbound/v1/SqlServerDatabase$1.class
+com/lansweeper/dp/outbound/v1/MacMonitorInfoOrBuilder.class
 com/lansweeper/dp/outbound/v1/UserAccountOrBuilder.class
 com/lansweeper/dp/outbound/v1/IpInfoOrBuilder.class
 com/lansweeper/dp/outbound/v1/Chassis$1.class
@@ -817,6 +820,7 @@ com/lansweeper/dp/outbound/v1/SnmpInfo$1.class
 com/lansweeper/dp/outbound/v1/VmwareDatacenter$ClustersDefaultEntryHolder.class
 com/lansweeper/dp/outbound/v1/SqlServerService$1.class
 com/lansweeper/dp/outbound/v1/WindowsSqlServerChangeEvent$EventType.class
+com/lansweeper/dp/outbound/v1/MacMonitorInfo$1.class
 com/lansweeper/dp/outbound/v1/Memory.class
 com/lansweeper/dp/outbound/v1/IntuneApplication$Builder.class
 com/lansweeper/dp/outbound/v1/HttpCertificate$1.class

package/model/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -80,6 +80,7 @@
 /home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/MotherboardDeviceOrBuilder.java
 /home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/Entity.java
 /home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/AutoRunCommand.java
+/home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/MacMonitorInfoOrBuilder.java
 /home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/Office365ContactOrBuilder.java
 /home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/OtModuleOrBuilder.java
 /home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/CloudEntity.java
@@ -154,6 +155,7 @@
 /home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/Office365ServicePlanOrBuilder.java
 /home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/ComputerMacNetworkLocation.java
 /home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/MacPrinterSoftwareItem.java
+/home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/MacMonitorInfo.java
 /home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/WindowsPnpSignedDriver.java
 /home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/TrustedPlatformModule.java
 /home/circleci/project/packages/data.platform/outbound/grpc/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/ComputerConnectedPrinter.java

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lansweeper/data-platform-outbound-grpc",
-  "version": "0.3.31",
+  "version": "0.3.32",
   "description": "Data Platform Outbound gRPC",
   "main": "gen-proto/index.js",
   "types": "gen-proto/index.d.ts",
@@ -9,5 +9,5 @@
     "@grpc/grpc-js": "^1.5.1",
     "google-protobuf": "^3.17.0"
   },
-  "gitHead": "ffea88e2ae7a0c06e37331cbc4591154b93dab88"
+  "gitHead": "e8ca20a46c3e43e2dcfc31b107f3100d3d58cf92"
 }

package/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.lansweeper.dp.outbound.v1</groupId>
     <artifactId>parent</artifactId>
-    <version>0.3.30</version>
+    <version>0.3.31</version>
     <packaging>pom</packaging>
     <modules>
         <module>model</module>

package/proto/outbound.proto

@@ -1143,6 +1143,7 @@ message SpecHardwareInfo {
   optional string bus_speed = 7;          // mac
   optional string boot_rom_version = 8;   // mac
   optional string smc_version_system = 9; // mac
+  optional string model_number = 10; // mac
 
 }
 
@@ -2102,7 +2103,7 @@ message SoundCard {
  * Graphics Card for computers: Windows.VideoControllers, Unix.SoundCards (=PciCards)
  **/
 message GraphicsCard {
-  optional	string	name = 1; //	Windows, Linux
+  optional	string	name = 1; //	Windows, Linux, MacOS
   optional	int32	color_planes_count = 2; //		Windows
   optional	int32	current_bits_per_pixel = 3; //		Windows
   optional	int32	current_horizontal_resolution = 4; //		Windows
@@ -2110,22 +2111,22 @@ message GraphicsCard {
   optional	int32	current_refresh_rate = 6; //		Windows
   optional	MappedValue	current_scan_mode = 7; //		Windows
   optional	int32	current_vertical_resolution = 8; //		Windows
-  optional	string	device_id = 9; //		Windows, Linux
+  optional	string	device_id = 9; //		Windows, Linux, MacOS
   optional	int32	device_specific_pens = 10; //		Windows
   optional	string	driver_version = 11; //		Windows
   optional	string	inf_filename = 12; //		Windows
   optional	string	inf_section = 13; //		Windows
   optional	string	installed_display_drivers = 14; //		Windows
   optional	bool	is_monochrome = 15; //		Windows
-  optional	string	manufacturer = 16; //		Windows, Linux
+  optional	string	manufacturer = 16; //		Windows, Linux, MacOS
   optional	int32	max_refresh_rate = 17; //		Windows
-  optional	int64	memory = 18; //		Windows
+  optional	int64	memory = 18; //		Windows, MacOS
   optional	MappedValue	memory_type = 19; //		Windows
   optional	int32	min_refresh_rate = 20; //		Windows
   optional	string	pci_type = 21; //		Linux
   optional	string	pnp_device_id = 22; //		Windows
   optional	MappedValue	state = 23; //		Windows
-  optional	string	subsystem_manufacturer = 24; //		Linux
+  optional	string	subsystem_manufacturer = 24; //		Linux, MacOS
   optional	string	subsystem_name = 25; //		Linux
   optional	MappedValue	video_architecture = 26; //		Windows
   optional	string	video_mode = 27; //		Windows
@@ -3220,6 +3221,7 @@ message Monitor {
 
   oneof spec {
     WindowsMonitorInfo windows = 20;
+    MacMonitorInfo mac = 21;
   }
 
   // placeholder to be able to inject the catalog meta-data if/when needed
@@ -3239,6 +3241,30 @@ message WindowsMonitorInfo {
   optional string device_id = 8;
 }
 
+message MacMonitorInfo {
+  optional string name = 1;
+  optional string product_id = 2;
+  optional string serial_number = 3;
+  optional string vendor_id = 4;
+  optional string week = 5;
+  optional string year = 6;
+  optional string id = 7;
+  optional string pixels = 8;
+  optional string resolution = 9;
+  optional string ambient_brightness = 10;
+  optional string connection_type = 11;
+  optional string display_type = 12;
+  optional string is_main = 13;
+  optional string mirror = 14;
+  optional string is_online = 15;
+  optional string pixel_resolution = 16;
+  optional string core_image = 17;
+  optional string depth = 18;
+  optional string quartz_extreme = 19;
+  optional string device_type = 20;
+  optional string built_in = 21;
+}
+
 // Section element for Wi-Fi (AirPort) info on Mac. To be mapper from MacWifi from inbound model
 message ComputerMacWifiController {
   repeated WiFiInterface airport_interfaces = 1;

package/service/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.lansweeper.dp.outbound.v1</groupId>
         <artifactId>parent</artifactId>
-        <version>0.3.30</version>
+        <version>0.3.31</version>
     </parent>
 
     <artifactId>outbound-service</artifactId>

package/service/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 08 15:13:22 UTC 2024
+#Tue Nov 12 10:37:00 UTC 2024
 groupId=com.lansweeper.dp.outbound.v1
 artifactId=outbound-service
-version=0.3.30
+version=0.3.31