adding store-scu

CMakeLists.txt

@@ -30,7 +30,7 @@ include(CMake/dcmtkPrepare.cmake NO_POLICY_SCOPE)
 #  dcmimage dcmjpeg dcmjpls dcmtls dcmnet
 #  CACHE STRING "List of modules that should be built.")
 
-set(DCMTK_MODULES ofstd oflog dcmdata dcmnet
+set(DCMTK_MODULES ofstd oflog dcmdata dcmnet dcmjpeg dcmjpls dcmimage dcmimgle
   CACHE STRING "List of modules that should be built.")
 
 #-----------------------------------------------------------------------------
@@ -88,7 +88,7 @@ add_library(${PROJECT_NAME} SHARED
 
 # Define dependency libraries
 #----------------------------
-target_link_libraries(${PROJECT_NAME} dcmnet dcmdata oflog ofstd)
+target_link_libraries(${PROJECT_NAME} ${DCMTK_MODULES})
 
 # Gives our library file a .node extension without any "lib" prefix
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")

README.md

@@ -11,11 +11,12 @@ Nodejs native addon for DICOM DIMSE services using the DCMTK DICOM c++ toolkit.
 * C-Find-scu
 * C-Move-scu
 * C-Get-scu
+* C-Store-scu
 * C-Store-scp
 
 # Roadmap:
-* C-Store-scu
 * extended characterSet support
+* JPEG 2000 support (c-store scu)
 
 ## How to install
 This package uses prebuild to fetch precompiled binaries, so provided your platform is supported, all you need to do is:
@@ -27,6 +28,9 @@ Otherwise install will try to compile the sources for your platform, you will ne
 
 ## Examples
 
+run the examples:
+```npm run example:[echo|find|get|move|store]```
+
 # Store-SCP
 ```
 const dimse = require('dicom-dimse-native');
@@ -38,7 +42,7 @@ dimse.startScp(JSON.stringify(
             "ip" : "127.0.0.1",
             "port": "9999"
         },
-	"storagePath": "./data"
+    "storagePath": "./data" // Directory where incoming DICOM files will be stored
     }
     ), (result) => {
         try {
@@ -100,7 +104,7 @@ dimse.getScu(JSON.stringify(
             "ip" : "127.0.0.1",
             "port": "5678"
         },
-        "storagePath": "./data"
+        "storagePath": "./data" // Directory where incoming DICOM files will be stored
         "tags" : [
             {
                 "key": "0020000D", 
@@ -122,6 +126,32 @@ dimse.getScu(JSON.stringify(
 });
 ```
 
+# Store-SCU
+```
+dimse.storeScu(JSON.stringify(
+    {
+        "source": {
+            "aet": "DCMTK",
+            "ip" : "127.0.0.1",
+            "port": "9999"
+        },
+        "target": {
+            "aet": "CONQUESTSRV1",
+            "ip" : "127.0.0.1",
+            "port": "5678"
+        },
+        "sourcePath": "./input" // Directory with DICOM files to be send
+    }
+), (result) => {
+    try {
+        console.log(JSON.parse(result));
+    }
+    catch {
+        console.log(result);
+    }
+});
+```
+
 # Find-SCU
 ```
 dimse.findScu(JSON.stringify(

dcmimage/CMakeLists.txt

@@ -5,6 +5,6 @@ project(dcmimage)
 include_directories("${dcmimage_SOURCE_DIR}/include" "${ofstd_SOURCE_DIR}/include" "${oflog_SOURCE_DIR}/include" "${dcmdata_SOURCE_DIR}/include" "${dcmimgle_SOURCE_DIR}/include" ${ZLIB_INCDIR} ${LIBTIFF_INCDIR} ${LIBPNG_INCDIR})
 
 # recurse into subdirectories
-foreach(SUBDIR libsrc apps include)
+foreach(SUBDIR libsrc include)
   add_subdirectory(${SUBDIR})
 endforeach()

dcmimgle/CMakeLists.txt

@@ -5,6 +5,6 @@ project(dcmimgle)
 include_directories("${dcmimgle_SOURCE_DIR}/include" "${ofstd_SOURCE_DIR}/include" "${oflog_SOURCE_DIR}/include" "${dcmdata_SOURCE_DIR}/include" ${ZLIB_INCDIR})
 
 # recurse into subdirectories
-foreach(SUBDIR libsrc apps include data)
+foreach(SUBDIR libsrc include data)
   add_subdirectory(${SUBDIR})
 endforeach()

dcmjpeg/CMakeLists.txt

@@ -2,6 +2,6 @@
 project(dcmjpeg)
 
 # recurse into subdirectories
-foreach(SUBDIR libsrc libijg8 libijg12 libijg16 apps include)
+foreach(SUBDIR libsrc libijg8 libijg12 libijg16 include)
   add_subdirectory(${SUBDIR})
 endforeach()

dcmjpls/CMakeLists.txt

@@ -2,6 +2,6 @@
 project(dcmjpls)
 
 # recurse into subdirectories
-foreach(SUBDIR libsrc libcharls apps include)
+foreach(SUBDIR libsrc libcharls include)
   add_subdirectory(${SUBDIR})
 endforeach()

examples/store.js

@@ -0,0 +1,28 @@
+const addon = require('../index');
+
+addon.storeScu(JSON.stringify(
+    {
+        "source": {
+            "aet": "IMEBRA",
+            "ip" : "127.0.0.1",
+            "port": "9999"
+        },
+        "target": {
+            "aet": "CONQUESTSRV1",
+            "ip" : "127.0.0.1",
+            "port": "5678"
+        },
+        "sourcePath": "./examples/dicom",
+        "verbose": true
+    }
+), (result) => {
+        if (result && result.length > 0) {
+            try
+            {
+                console.log(JSON.parse(result));
+            }
+            catch (e) {
+                console.log(e, result);
+            }
+        }
+});

package.json

@@ -1,10 +1,15 @@
 {
   "name": "dicom-dimse-native",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "description": "native addon using DCMTK dicom toolkit",
   "main": "index.js",
   "scripts": {
     "install": "npx prebuild-install -r napi || npx cmake-js compile",
+    "example:echo": "node ./examples/echo.js",
+    "example:find": "node ./examples/find.js",
+    "example:get": "node ./examples/get.js",
+    "example:move": "node ./examples/move.js",
+    "example:store": "node ./examples/store.js",
     "test": "mocha"
   },
   "keywords": [
@@ -15,7 +20,9 @@
     "DICOM-DIMSE-NATIVE",
     "DCMTK",
     "NETWORK",
-    "DICOMJS"
+    "DICOMJS",
+    "SCU",
+    "SCP"
   ],
   "author": "Michael Knopke",
   "license": "ISC",

src/Addon.cc

@@ -4,6 +4,7 @@
 #include "FindAsyncWorker.h"
 #include "GetAsyncWorker.h"
 #include "MoveAsyncWorker.h"
+#include "StoreAsyncWorker.h"
 #include "ServerAsyncWorker.h"
 
 using namespace Napi;
@@ -44,6 +45,15 @@ Value DoMove(const CallbackInfo& info) {
     return info.Env().Undefined();
 }
 
+Value DoStore(const CallbackInfo& info) {
+    std::string input = info[0].As<String>().Utf8Value();
+    Function cb = info[1].As<Function>();
+
+    auto worker = new StoreAsyncWorker(input, cb);
+    worker->Queue();
+    return info.Env().Undefined();
+}
+
 Value StartScp(const CallbackInfo& info) {
     std::string input = info[0].As<String>().Utf8Value();
     Function cb = info[1].As<Function>();
@@ -63,6 +73,8 @@ Object Init(Env env, Object exports) {
                 Function::New(env, DoGet));
     exports.Set(String::New(env, "moveScu"),
                 Function::New(env, DoMove));
+    exports.Set(String::New(env, "storeScu"),
+                Function::New(env, DoStore));
     exports.Set(String::New(env, "startScp"),
                 Function::New(env, StartScp));
     return exports;

src/GetAsyncWorker.cc

@@ -19,6 +19,7 @@ using json = nlohmann::json;
 #include "dcmtk/dcmdata/dcpath.h"   /* for DcmPathProcessor */
 #include "dcmtk/dcmdata/dcostrmz.h" /* for dcmZlibCompressionLevel */
 
+
 #ifdef WITH_ZLIB
 #include <zlib.h>
 #endif
@@ -128,6 +129,7 @@ namespace
 
 GetAsyncWorker::GetAsyncWorker(std::string data, Function &callback) : BaseAsyncWorker(data, callback)
 {
+    ns::registerCodecs();
 }
 
 void GetAsyncWorker::Execute(const ExecutionProgress &progress)

src/ServerAsyncWorker.cc

@@ -390,6 +390,7 @@ OFCondition acceptAssociation(T_ASC_Network *net, DcmAssociationConfiguration &a
 
 ServerAsyncWorker::ServerAsyncWorker(std::string data, Function &callback) : BaseAsyncWorker(data, callback)
 {
+    ns::registerCodecs();
 }
 
 void ServerAsyncWorker::Execute(const ExecutionProgress &progress)