Merge pull request #47 from EdgePi-Cloud/update-pb

Update protobuf.

package.json

@@ -13,7 +13,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@edgepi-cloud/rpc-protobuf": "^1.0.16",
+    "@edgepi-cloud/edgepi-rpc-protobuf": "^1.0.24",
     "@types/node": "^20.4.2",
     "protobufjs": "^7.2.4",
     "protobufjs-cli": "^1.1.1",

src/services/AdcService/AdcEnums.ts

@@ -5,7 +5,7 @@ import type {
   convMode, filterMode, adcNum, diffMode
 } from './AdcTypes'
 
-const protoPckgPath = path.join(require.resolve('@edgepi-cloud/rpc-protobuf'), '..')
+const protoPckgPath = path.join(require.resolve('@edgepi-cloud/edgepi-rpc-protobuf'), '../edgepi_rpc_protos');
 
 const root = protobuf.loadSync(path.join(protoPckgPath, 'adc.proto'))
 

src/services/AdcService/AdcService.ts

@@ -6,7 +6,7 @@ import { createConfigArgsList } from '../util/helpers'
 import type { SuccessMsg } from '../serviceTypes/successMsg'
 import type { TempReading, VoltageReadMsg, adc, adcConfig, diff } from './AdcTypes'
 
-const protoPckgPath = path.join(require.resolve('@edgepi-cloud/rpc-protobuf'), '..');
+const protoPckgPath = path.join(require.resolve('@edgepi-cloud/edgepi-rpc-protobuf'), '../edgepi_rpc_protos');
 
 /**
  * @constructor Adc class for calling EdgePi adc SDK methods through RPC

src/services/DacService/DacChannel.ts

@@ -3,7 +3,7 @@ import path from 'path'
 import { DacChannels } from './DacTypes';
 
 // Construct the path to the proto pacakge directory
-const protoPckgPath = path.join(require.resolve('@edgepi-cloud/rpc-protobuf'),'..');
+const protoPckgPath = path.join(require.resolve('@edgepi-cloud/edgepi-rpc-protobuf'), '../edgepi_rpc_protos');
 
 const root = protobuf.loadSync(path.join(protoPckgPath, 'dac.proto'))
 export const DACChannel = root.lookupEnum('DACChannels').values as unknown as DacChannels

src/services/DacService/DacService.ts

@@ -5,7 +5,7 @@ import type { serverResponse, serviceRequest } from '../../rpcChannel/ReqRepType
 import type { DACChannel, GainStateMsg, GetState, State, StateMsg } from './DacTypes'
 import { SuccessMsg } from '../serviceTypes/successMsg'
 
-const protoPckgPath = path.join(require.resolve('@edgepi-cloud/rpc-protobuf'), '..');
+const protoPckgPath = path.join(require.resolve('@edgepi-cloud/edgepi-rpc-protobuf'), '../edgepi_rpc_protos');
 
 /**
  * @constructor DacService class for calling EdgePi digital input SDK methods through RPC

src/services/DinService/DinPins.ts

@@ -3,7 +3,7 @@ import path from 'path'
 import { DinPins } from './DinTypes';
 
 // Construct the path to the proto pacakge directory
-const protoPckgPath = path.join(require.resolve('@edgepi-cloud/rpc-protobuf'),'..');
+const protoPckgPath = path.join(require.resolve('@edgepi-cloud/edgepi-rpc-protobuf'), '../edgepi_rpc_protos');
 
 const root = protobuf.loadSync(path.join(protoPckgPath, 'din.proto'))
 export const DINPins = root.lookupEnum('DinPins').values as unknown as DinPins

src/services/DinService/DinService.ts

@@ -5,7 +5,7 @@ import type { serverResponse, serviceRequest } from '../../rpcChannel/ReqRepType
 import { DinPin } from './DinTypes'
 import { StateMsg } from '../serviceTypes/stateMsg'
 
-const protoPckgPath = path.join(require.resolve('@edgepi-cloud/rpc-protobuf'), '..');
+const protoPckgPath = path.join(require.resolve('@edgepi-cloud/edgepi-rpc-protobuf'), '../edgepi_rpc_protos');
 
 /**
  * @constructor DinService class for calling EdgePi digital input SDK methods through RPC

src/services/DoutService/DoutPins.ts

@@ -2,7 +2,7 @@ import * as protobuf from 'protobufjs'
 import path from 'path';
 import { DoutPins } from './DoutTypes';
 
-const protoPckgPath = path.join(require.resolve('@edgepi-cloud/rpc-protobuf'), '..');
+const protoPckgPath = path.join(require.resolve('@edgepi-cloud/edgepi-rpc-protobuf'), '../edgepi_rpc_protos');
 
 const root = protobuf.loadSync(path.join(protoPckgPath, 'dout.proto'))
 export const DOUTPins = root.lookupEnum('DoutPins').values as unknown as DoutPins

src/services/DoutService/DoutService.ts

@@ -6,7 +6,7 @@ import { DoutPin, DoutTriState } from './DoutTypes'
 import { SuccessMsg } from '../serviceTypes/successMsg'
 
 // Construct the path to the proto pacakge directory
-const protoPckgPath = path.join(require.resolve('@edgepi-cloud/rpc-protobuf'), '..');
+const protoPckgPath = path.join(require.resolve('@edgepi-cloud/edgepi-rpc-protobuf'), '../edgepi_rpc_protos');
 
   /**
    * @constructor DoutService class for calling EdgePi digital output SDK methods through RPC

src/services/DoutService/DoutStates.ts

@@ -2,7 +2,7 @@ import * as protobuf from 'protobufjs'
 import path from 'path'
 import { DoutTriStates } from './DoutTypes';
 
-const protoPckgPath = path.join(require.resolve('@edgepi-cloud/rpc-protobuf'), '..');
+const protoPckgPath = path.join(require.resolve('@edgepi-cloud/edgepi-rpc-protobuf'), '../edgepi_rpc_protos');
 const root = protobuf.loadSync(path.join(protoPckgPath, 'dout.proto'))
 const DoutTriState = root.lookupEnum('DoutTriState').values as unknown as DoutTriStates
 

src/services/LedService/LedPins.ts

@@ -3,7 +3,7 @@ import path from 'path'
 import { LedPins } from './LedTypes';
 
 // Construct the path to the proto pacakge directory
-const protoPckgPath = path.join(require.resolve('@edgepi-cloud/rpc-protobuf'),'..');
+const protoPckgPath = path.join(require.resolve('@edgepi-cloud/edgepi-rpc-protobuf'), '../edgepi_rpc_protos');
 
 const root = protobuf.loadSync(path.join(protoPckgPath, 'led.proto'))
 export const LEDPins = root.lookupEnum('LEDPins').values as unknown as LedPins

src/services/LedService/LedService.ts

@@ -5,7 +5,7 @@ import type { serverResponse, serviceRequest } from '../../rpcChannel/ReqRepType
 import { LEDPin } from '../LedService/LedTypes'
 import { SuccessMsg } from '../serviceTypes/successMsg'
 
-const protoPckgPath = path.join(require.resolve('@edgepi-cloud/rpc-protobuf'), '..');
+const protoPckgPath = path.join(require.resolve('@edgepi-cloud/edgepi-rpc-protobuf'), '../edgepi_rpc_protos');
 
 /**
  * @constructor LEDService class for calling EdgePi LED SDK methods through RPC

src/services/RelayService/RelayService.ts

@@ -5,7 +5,7 @@ import type { serverResponse, serviceRequest } from '../../rpcChannel/ReqRepType
 import { SuccessMsg } from '../serviceTypes/successMsg';
 import { StateMsg } from '../serviceTypes/stateMsg';
 
-const protoPckgPath = path.join(require.resolve('@edgepi-cloud/rpc-protobuf'), '..');
+const protoPckgPath = path.join(require.resolve('@edgepi-cloud/edgepi-rpc-protobuf'), '../edgepi_rpc_protos');
 
 /**
  * @constructor RelayService class for calling EdgePi LED SDK methods through RPC

src/services/TcService/TcService.ts

@@ -4,7 +4,7 @@ import { RpcChannel } from '../../rpcChannel/RpcChannel'
 import type { serverResponse, serviceRequest } from '../../rpcChannel/ReqRepTypes'
 import type { TempReading } from './tcTypes'
 
-const protoPckgPath = path.join(require.resolve('@edgepi-cloud/rpc-protobuf'), '..')
+const protoPckgPath = path.join(require.resolve('@edgepi-cloud/edgepi-rpc-protobuf'), '../edgepi_rpc_protos');
 
   /**
    * @constructor TcService class for calling EdgePi thermocouple SDK methods through RPC