@react-native-ohos/react-native-tcp-socket 6.2.1-rc.1

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Rapsssito
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.OpenSource

@@ -0,0 +1,11 @@
+[
+    {
+        "Name": "react-native-tcp-socket",
+        "License": "MIT License",
+        "License File": "https://github.com/Rapsssito/react-native-tcp-socket/blob/master/LICENSE",
+        "Version Number": "6.2.0",
+        "Owner" : "xiafeng@huawei.com",
+        "Upstream URL": "https://github.com/Rapsssito/react-native-tcp-socket",
+        "Description": "React Native TCP socket API for HarmonyOS with SSL/TLS support"
+    }
+]

package/README.md

@@ -0,0 +1,13 @@
+# @react-native-ohos/react-native-tcp-socket
+
+This project is based on [react-native-tcp-socket](https://github.com/Rapsssito/react-native-tcp-socket)@6.3.0
+
+## Documentation
+
+- [中文](https://gitee.com/react-native-oh-library/usage-docs/blob/master/zh-cn/react-native-tcp-socket.md)
+
+- [English](https://gitee.com/react-native-oh-library/usage-docs/blob/master/en/react-native-tcp-socket.md)
+
+## License
+
+This library is licensed under [The MIT License (MIT)](https://github.com/Rapsssito/react-native-tcp-socket/blob/master/LICENSE)

package/harmony/tcp_socket/Index.ets

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+import { TcpSocketPackage } from './src/main/ets/TcpSocketPackage';
+export * from './ts'
+
+export default TcpSocketPackage;

package/harmony/tcp_socket/build-profile.json5

@@ -0,0 +1,31 @@
+{
+  "apiType": "stageMode",
+  "buildOption": {
+  },
+  "buildOptionSet": [
+    {
+      "name": "release",
+      "arkOptions": {
+        "obfuscation": {
+          "ruleOptions": {
+            "enable": false,
+            "files": [
+              "./obfuscation-rules.txt"
+            ]
+          },
+          "consumerFiles": [
+            "./consumer-rules.txt"
+          ]
+        }
+      },
+    },
+  ],
+  "targets": [
+    {
+      "name": "default"
+    },
+    {
+      "name": "ohosTest"
+    }
+  ]
+}

package/harmony/tcp_socket/hvigorfile.ts

@@ -0,0 +1,6 @@
+import { harTasks } from '@ohos/hvigor-ohos-plugin';
+
+export default {
+    system: harTasks,  /* Built-in plugin of Hvigor. It cannot be modified. */
+    plugins:[]         /* Custom plugin to extend the functionality of Hvigor. */
+}

package/harmony/tcp_socket/obfuscation-rules.txt

@@ -0,0 +1,23 @@
+# Define project specific obfuscation rules here.
+# You can include the obfuscation configuration files in the current module's build-profile.json5.
+#
+# For more details, see
+#   https://developer.huawei.com/consumer/cn/doc/harmonyos-guides-V5/source-obfuscation-V5
+
+# Obfuscation options:
+# -disable-obfuscation: disable all obfuscations
+# -enable-property-obfuscation: obfuscate the property names
+# -enable-toplevel-obfuscation: obfuscate the names in the global scope
+# -compact: remove unnecessary blank spaces and all line feeds
+# -remove-log: remove all console.* statements
+# -print-namecache: print the name cache that contains the mapping from the old names to new names
+# -apply-namecache: reuse the given cache file
+
+# Keep options:
+# -keep-property-name: specifies property names that you want to keep
+# -keep-global-name: specifies names that you want to keep in the global scope
+
+-enable-property-obfuscation
+-enable-toplevel-obfuscation
+-enable-filename-obfuscation
+-enable-export-obfuscation

package/harmony/tcp_socket/oh-package.json5

@@ -0,0 +1,11 @@
+{
+  "name": "@react-native-ohos/react-native-tcp-socket",
+  "version": "6.2.1-rc.1",
+  "description": "Please describe the basic information.",
+  "main": "Index.ets",
+  "author": "",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "@rnoh/react-native-openharmony": "file:../libs/react_native_openharmony-5.0.0.491.har"
+  }
+}

package/harmony/tcp_socket/src/main/cpp/CMakeLists.txt

@@ -0,0 +1,10 @@
+# the minimum version of CMake
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+set(rnoh_tcp_socket_generated_dir "${CMAKE_CURRENT_SOURCE_DIR}/generated")
+file(GLOB_RECURSE rnoh_tcp_socket_generated_SRC "${rnoh_tcp_socket_generated_dir}/**/*.cpp")
+file(GLOB rnoh_tcp_socket_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(rnoh_tcp_socket SHARED ${rnoh_tcp_socket_SRC} ${rnoh_tcp_socket_generated_SRC})
+target_include_directories(rnoh_tcp_socket PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${rnoh_tcp_socket_generated_dir})
+target_link_libraries(rnoh_tcp_socket PUBLIC rnoh)

package/harmony/tcp_socket/src/main/cpp/TcpSocketPackage.h

@@ -0,0 +1,26 @@
+
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the MIT License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://gitee.com/openharmony-sig/rntpc_react-native-document-picker
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "generated/RNOH/generated/BaseReactNativeTcpSocketPackage.h"
+
+namespace rnoh {
+class TcpSocketPackage : public BaseReactNativeTcpSocketPackage {
+    using Super = BaseReactNativeTcpSocketPackage;
+    using Super::Super;
+};
+} // namespace rnoh

package/harmony/tcp_socket/src/main/cpp/generated/RNOH/generated/BaseReactNativeTcpSocketPackage.h

@@ -0,0 +1,65 @@
+/**
+ * This code was generated by "react-native codegen-lib-harmony"
+ */
+
+#pragma once
+
+#include "RNOH/Package.h"
+#include "RNOH/ArkTSTurboModule.h"
+#include "RNOH/generated/turbo_modules/TcpSocketModule.h"
+
+namespace rnoh {
+
+class BaseReactNativeTcpSocketPackageTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
+  public:
+    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
+        if (name == "TcpSocketModule") {
+            return std::make_shared<TcpSocketModule>(ctx, name);
+        }
+        return nullptr;
+    };
+};
+
+class BaseReactNativeTcpSocketPackageEventEmitRequestHandler : public EventEmitRequestHandler {
+  public:
+    void handleEvent(Context const &ctx) override {
+        auto eventEmitter = ctx.shadowViewRegistry->getEventEmitter<facebook::react::EventEmitter>(ctx.tag);
+        if (eventEmitter == nullptr) {
+            return;
+        }
+
+        std::vector<std::string> supportedEventNames = {
+        };
+        if (std::find(supportedEventNames.begin(), supportedEventNames.end(), ctx.eventName) != supportedEventNames.end()) {
+            eventEmitter->dispatchEvent(ctx.eventName, ArkJS(ctx.env).getDynamic(ctx.payload));
+        }    
+    }
+};
+
+
+class BaseReactNativeTcpSocketPackage : public Package {
+  public:
+    BaseReactNativeTcpSocketPackage(Package::Context ctx) : Package(ctx){};
+
+    std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override {
+        return std::make_unique<BaseReactNativeTcpSocketPackageTurboModuleFactoryDelegate>();
+    }
+
+    std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override {
+        return {
+        };
+    }
+
+    ComponentJSIBinderByString createComponentJSIBinderByName() override {
+        return {
+        };
+    };
+
+    EventEmitRequestHandlers createEventEmitRequestHandlers() override {
+        return {
+            std::make_shared<BaseReactNativeTcpSocketPackageEventEmitRequestHandler>(),
+        };
+    }
+};
+
+} // namespace rnoh

package/harmony/tcp_socket/src/main/cpp/generated/RNOH/generated/turbo_modules/TcpSocketModule.cpp

@@ -0,0 +1,28 @@
+/**
+ * This code was generated by "react-native codegen-lib-harmony"
+ */
+
+#include "TcpSocketModule.h"
+
+namespace rnoh {
+using namespace facebook;
+
+TcpSocketModule::TcpSocketModule(const ArkTSTurboModule::Context ctx, const std::string name) : ArkTSTurboModule(ctx, name) {
+    methodMap_ = {
+        ARK_METHOD_METADATA(listen, 2),
+        ARK_METHOD_METADATA(close, 1),
+        ARK_METHOD_METADATA(destroy, 1),
+        ARK_METHOD_METADATA(end, 1),
+        ARK_METHOD_METADATA(pause, 1),
+        ARK_METHOD_METADATA(resume, 1),
+        ARK_METHOD_METADATA(connect, 4),
+        ARK_METHOD_METADATA(startTLS, 2),
+        ARK_METHOD_METADATA(write, 3),
+        ARK_METHOD_METADATA(setNoDelay, 2),
+        ARK_METHOD_METADATA(setKeepAlive, 3),
+        ARK_ASYNC_METHOD_METADATA(getPeerCertificate, 1),
+        ARK_ASYNC_METHOD_METADATA(getCertificate, 1),
+    };
+}
+
+} // namespace rnoh

package/harmony/tcp_socket/src/main/cpp/generated/RNOH/generated/turbo_modules/TcpSocketModule.h

@@ -0,0 +1,16 @@
+/**
+ * This code was generated by "react-native codegen-lib-harmony"
+ */
+
+#pragma once
+
+#include "RNOH/ArkTSTurboModule.h"
+
+namespace rnoh {
+
+class JSI_EXPORT TcpSocketModule : public ArkTSTurboModule {
+  public:
+    TcpSocketModule(const ArkTSTurboModule::Context ctx, const std::string name);
+};
+
+} // namespace rnoh

package/harmony/tcp_socket/src/main/cpp/generated/react/renderer/components/react_native_tcp_socket/ComponentDescriptors.h

@@ -0,0 +1,22 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateComponentDescriptorH.js
+ */
+
+#pragma once
+
+#include <react/renderer/components/react_native_tcp_socket/ShadowNodes.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook

package/harmony/tcp_socket/src/main/cpp/generated/react/renderer/components/react_native_tcp_socket/EventEmitters.cpp

@@ -0,0 +1,18 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateEventEmitterCpp.js
+ */
+
+#include <react/renderer/components/react_native_tcp_socket/EventEmitters.h>
+
+
+namespace facebook {
+namespace react {
+
+} // namespace react
+} // namespace facebook

package/harmony/tcp_socket/src/main/cpp/generated/react/renderer/components/react_native_tcp_socket/EventEmitters.h

@@ -0,0 +1,19 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateEventEmitterH.js
+ */
+#pragma once
+
+#include <react/renderer/components/view/ViewEventEmitter.h>
+
+
+namespace facebook {
+namespace react {
+
+} // namespace react
+} // namespace facebook

package/harmony/tcp_socket/src/main/cpp/generated/react/renderer/components/react_native_tcp_socket/Props.cpp

@@ -0,0 +1,21 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GeneratePropsCpp.js
+ */
+
+#include <react/renderer/components/react_native_tcp_socket/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/propsConversions.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook

package/harmony/tcp_socket/src/main/cpp/generated/react/renderer/components/react_native_tcp_socket/Props.h

@@ -0,0 +1,20 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GeneratePropsH.js
+ */
+#pragma once
+
+
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook

package/harmony/tcp_socket/src/main/cpp/generated/react/renderer/components/react_native_tcp_socket/ShadowNodes.cpp

@@ -0,0 +1,19 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateShadowNodeCpp.js
+ */
+
+#include <react/renderer/components/react_native_tcp_socket/ShadowNodes.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook

package/harmony/tcp_socket/src/main/cpp/generated/react/renderer/components/react_native_tcp_socket/ShadowNodes.h

@@ -0,0 +1,25 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateShadowNodeH.js
+ */
+
+#pragma once
+
+#include <react/renderer/components/react_native_tcp_socket/EventEmitters.h>
+#include <react/renderer/components/react_native_tcp_socket/Props.h>
+#include <react/renderer/components/react_native_tcp_socket/States.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <jsi/jsi.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook

package/harmony/tcp_socket/src/main/cpp/generated/react/renderer/components/react_native_tcp_socket/States.cpp

@@ -0,0 +1,18 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/react_native_tcp_socket/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook

package/harmony/tcp_socket/src/main/cpp/generated/react/renderer/components/react_native_tcp_socket/States.h

@@ -0,0 +1,23 @@
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook

package/harmony/tcp_socket/src/main/ets/Logger.ts

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+import hilog from '@ohos.hilog';
+
+class Logger {
+  private domain: number;
+  private prefix: string;
+  private format: string = '%{public}s, %{public}s';
+  private isDebug: boolean;
+
+  /**
+   * constructor.
+   *
+   * @param Prefix Identifies the log tag.
+   * @param domain Domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF.
+   */
+  constructor(prefix: string = 'RNCToolbarAndroid', domain: number = 0xFF00, isDebug = false) {
+    this.prefix = prefix;
+    this.domain = domain;
+    this.isDebug = isDebug;
+  }
+
+  debug(...args: string[]): void {
+    if (this.isDebug) {
+      hilog.debug(this.domain, this.prefix, this.format, args);
+    }
+  }
+
+  info(...args: string[]): void {
+    hilog.info(this.domain, this.prefix, this.format, args);
+  }
+
+  warn(...args: string[]): void {
+    hilog.warn(this.domain, this.prefix, this.format, args);
+  }
+
+  error(...args: string[]): void {
+    hilog.error(this.domain, this.prefix, this.format, args);
+  }
+}
+
+export default new Logger('RNTextSizeTurboModule', 0xFF00, false)

package/harmony/tcp_socket/src/main/ets/TcpEventListener.ts

@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+import { RNInstance, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
+import { TcpSocketClient } from './TcpSocketClient'
+import { TcpSocketServer } from './TcpSocketServer'
+import { socket } from '@kit.NetworkKit';
+
+export class TcpEventListener {
+  private rnInstance?: RNInstance;
+
+  constructor(ctx: TurboModuleContext) {
+    this.rnInstance = ctx.rnInstance;
+  }
+
+  async onConnection(serverId: number, clientId: number, connection: socket.TCPSocketConnection) {
+    let localAddress = await connection?.getLocalAddress() as socket.NetAddress;
+    let remoteAddress = await connection?.getRemoteAddress() as socket.NetAddress;
+    let localFamily = remoteAddress.family === 2 ? "IPv6" : "IPv4"
+    this.sendEvent("connection", {
+      "id": serverId,
+      "info": {
+        "id": clientId,
+        "connection": {
+          "localAddress": localAddress.address,
+          "localPort": localAddress.port,
+          "remoteAddress": remoteAddress.address,
+          "remotePort": remoteAddress.port,
+          "remoteFamily": localFamily
+        }
+      }
+    });
+  }
+
+  async onSecureConnection(serverId: number, clientId: number, connection: socket.TLSSocketConnection) {
+    let localAddress = await connection?.getLocalAddress() as socket.NetAddress;
+    let remoteAddress = await connection?.getRemoteAddress() as socket.NetAddress;
+    let remoteFamily = remoteAddress.family === 2 ? "IPv6" : "IPv4"
+    this.sendEvent("secureConnection", {
+      "id": serverId,
+      "info": {
+        "id": clientId,
+        "connection": {
+          "localAddress": localAddress.address,
+          "localPort": localAddress.port,
+          "remoteAddress": remoteAddress.address,
+          "remotePort": remoteAddress.port,
+          "remoteFamily": remoteFamily
+        }
+      }
+    });
+  }
+
+
+  async onConnect(cid: number, client: TcpSocketClient) {
+    let tcpSocket: socket.TCPSocket | socket.TLSSocket | socket.TCPSocketConnection | socket.TLSSocketConnection | undefined =
+      client.getSocket();
+    let localAddress = await tcpSocket?.getLocalAddress() as socket.NetAddress;
+    let remoteAddress = await tcpSocket?.getRemoteAddress() as socket.NetAddress;
+    let remoteFamily = remoteAddress.family === 2 ? "IPv6" : "IPv4"
+    this.sendEvent("connect", {
+      "id": cid,
+      "connection": {
+        "localAddress": localAddress.address,
+        "localPort": localAddress.port,
+        "remoteAddress": remoteAddress.address,
+        "remotePort": remoteAddress.port,
+        "remoteFamily": remoteFamily
+      }
+    });
+  }
+
+  async onListen(cId: number, tcpSocketServer: TcpSocketServer) {
+    let serverSocket: socket.TCPSocketServer | socket.TLSSocketServer = tcpSocketServer.getServerSocket();
+    let address: socket.NetAddress = await serverSocket.getLocalAddress();
+    let localFamily = address.family === 2 ? "IPv6" : "IPv4"
+    this.sendEvent("listening", {
+      "id": cId,
+      "connection": {
+        "localAddress": address.address,
+        "localPort": address.port,
+        "localFamily": localFamily
+      }
+    });
+  }
+
+  onData(id: number,data:string) {
+    this.sendEvent("data", {
+      "id": id,
+      "data": data
+    });
+  }
+
+  onWritten(id: number, msgId: number, error: string) {
+    this.sendEvent("written", {
+      "id": id,
+      "msgId": msgId,
+      "error": error
+    });
+  }
+
+  onClose(id: number, error: string) {
+    this.sendEvent("close", {
+      "id": id,
+      "hadError": error ? true : false
+    });
+  }
+
+  onError(id: number, error: string): void {
+    this.sendEvent("error", {
+      "id": id,
+      "error": error
+    });
+  }
+
+  private sendEvent(eventName: string, params: object): void {
+    this.rnInstance?.emitDeviceEvent(eventName, params);
+  }
+}

package/harmony/tcp_socket/src/main/ets/TcpSocket.ts

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+export class TcpSocket {
+  private id: number;
+
+  constructor(id: number) {
+    this.id = id;
+  }
+
+  getId(): number {
+    return this.id;
+  }
+}