diff --git a/src/finclip_api.h b/src/finclip_api.h
index 7dcea9e..f490271 100644
--- a/src/finclip_api.h
+++ b/src/finclip_api.h
@@ -1,4 +1,4 @@
-#ifndef WRAPPER_SRC_PUBLIC_FINCLIP_API_H_
+#ifndef WRAPPER_SRC_PUBLIC_FINCLIP_API_H_
#define WRAPPER_SRC_PUBLIC_FINCLIP_API_H_
#include "finclip_api_const.h"
@@ -17,29 +17,30 @@ typedef struct IKnown IKnown;
typedef struct IResultSet IResultSet;
typedef struct IEvent IEvent;
typedef struct IFinPacker IFinPacker;
-typedef struct IFinConfig IFinConfig;
+typedef struct FinclipParams FinclipParams;
typedef struct IFinConfigPacker IFinConfigPacker;
typedef struct IPackerFactory IPackerFactory;
-typedef struct Callback Callback;
+typedef struct FinclipCallback FinclipCallback;
typedef void (*FinClipSDKCallback)(IEvent*);
/**
- * @brief
+ * @brief SDK初始化
*/
DLL_EXPORT int FINSTDMETHODCALLTYPE
finclip_initialize(IFinConfigPacker* configpacker);
+
/**
- * @brief
+ * @brief 获取配置工厂
*/
DLL_EXPORT IPackerFactory* FINSTDMETHODCALLTYPE finclip_get_packer_factory();
/**
- * @brief
+ * @brief 启动
*/
-DLL_EXPORT int FINSTDMETHODCALLTYPE finclip_start_applet(int appstore,
+DLL_EXPORT int FINSTDMETHODCALLTYPE finclip_start_applet(const char* appstore,
const char* appid);
/**
- * @brief
+ * @brief 关闭所有小程序
*/
DLL_EXPORT int FINSTDMETHODCALLTYPE finclip_close_all_applet();
@@ -49,8 +50,7 @@ DLL_EXPORT int FINSTDMETHODCALLTYPE finclip_close_all_applet();
DLL_EXPORT int FINSTDMETHODCALLTYPE finclip_close_applet(const char* appid);
/**
- * @brief 设置小程序主程序位置
- * 需要设置
+ * @brief 设置小程序窗口位置
*
*/
DLL_EXPORT void FINSTDMETHODCALLTYPE finclip_set_position(const char* appid,
@@ -65,107 +65,73 @@ DLL_EXPORT IFinConfigPacker* FINSTDMETHODCALLTYPE
finclip_packer_factory_get_config_packer(IPackerFactory* factory);
/**
- * @brief
+ * @brief 新建配置
*/
-DLL_EXPORT IFinConfig* FINSTDMETHODCALLTYPE
+DLL_EXPORT FinclipParams* FINSTDMETHODCALLTYPE
finclip_config_packer_new_config(IFinConfigPacker* packer);
/**
- * @brief
+ * @brief 获取配置, 如果获取失败, 则返回NULL
*/
-DLL_EXPORT IFinConfig* FINSTDMETHODCALLTYPE
-finclip_config_packer_get_config(IFinConfigPacker* packer, int appstore);
+DLL_EXPORT FinclipParams* FINSTDMETHODCALLTYPE
+finclip_config_packer_get_config(IFinConfigPacker* packer, char* appstore);
/**
- * @brief
+ * @brief 增加配置
*/
-DLL_EXPORT int FINSTDMETHODCALLTYPE
-finclip_config_packer_add_config(IFinConfigPacker* packer, IFinConfig* config);
+DLL_EXPORT int FINSTDMETHODCALLTYPE finclip_config_packer_add_config(
+ IFinConfigPacker* packer, FinclipParams* config);
/**
- * @brief
+ * @brief 注册自定义api, 供小程序或h5调用
+ * @param packer
+ * @param type 类型, 区分h5与小程序
+ * @param apis api名称
+ * @param handle 处理函数
+ * @param input 自定义参数, 透传给handle
*/
DLL_EXPORT void FINSTDMETHODCALLTYPE
-finclip_register_callback(IFinConfigPacker* packer, FinClipApiType type,
- const char* apis, FinclipApiHandle handle);
+finclip_register_api(IFinConfigPacker* packer, FinClipApiType type,
+ const char* apis, FinclipApiHandle handle, void* input);
/**
- * @brief
+ * @brief 创建启动参数
*/
-DLL_EXPORT void FINSTDMETHODCALLTYPE
-finclip_config_set_app_store(IFinConfig* config, int app_store);
+DLL_EXPORT FinclipParams* FINSTDMETHODCALLTYPE finclip_create_params();
/**
- * @brief
+ * @brief 销毁启动参数
*/
DLL_EXPORT void FINSTDMETHODCALLTYPE
-finclip_config_set_app_key(IFinConfig* config, const char* app_key);
+finclip_destory_params(FinclipParams* params);
/**
- * @brief
+ * @brief 设置启动参数
*/
-DLL_EXPORT void FINSTDMETHODCALLTYPE
-finclip_config_set_secret(IFinConfig* config, const char* secret);
-
+DLL_EXPORT void FINSTDMETHODCALLTYPE finclip_params_set(FinclipParams* params,
+ const char* key,
+ const char* value);
/**
- * @brief
+ * @brief 根据key删除启动启动参数
*/
-DLL_EXPORT void FINSTDMETHODCALLTYPE
-finclip_config_set_domain(IFinConfig* config, const char* domain);
-
-/**
- * @brief
- */
-DLL_EXPORT void FINSTDMETHODCALLTYPE
-finclip_config_set_app_window_style(IFinConfig* config, int type);
-
-/**
- * @brief 设置启动模式, 参见: StartFlags
- * 全同步模式: kBaseLibrarySync | kAppletSync
- */
-DLL_EXPORT void FINSTDMETHODCALLTYPE
-finclip_config_set_start_flag(IFinConfig* config, int flag);
-
-/**
- * @brief 是否展示loading动画
- */
-DLL_EXPORT void FINSTDMETHODCALLTYPE
-finclip_config_set_show_loading(IFinConfig* config, bool show_loading);
-
-/**
- * @brief 设置小程序主程序执行文件的位置, 当宿主程序和exe不在同一目录时,
- * 需要设置
- *
- */
-DLL_EXPORT void FINSTDMETHODCALLTYPE
-finclip_config_set_exe_path(IFinConfig* config, const char* exe_path);
+DLL_EXPORT void FINSTDMETHODCALLTYPE finclip_params_del(FinclipParams* params,
+ const char* key);
#ifdef _WIN32
/**
* @brief
*/
-DLL_EXPORT int FINSTDMETHODCALLTYPE
-finclip_start_applet_embed(int appstore, const char* appid, HWND container);
+DLL_EXPORT int FINSTDMETHODCALLTYPE finclip_start_applet_embed(
+ const char* appstore, const char* appid, HWND container);
+
+DLL_EXPORT int FINSTDMETHODCALLTYPE finclip_embed_applet(const char* appstore,
+ const char* appid,
+ HWND container);
#endif
-#ifdef __cplusplus
-
-/**
- * @brief
- */
-DLL_EXPORT void FINSTDMETHODCALLTYPE
-finclip_register_callback_cpp(IFinConfigPacker* packer, FinClipApiType type,
- const char* apis, Callback* callback);
-
-/**
- * @brief
- */
-DLL_EXPORT int FINSTDMETHODCALLTYPE finclip_invoke_api_cpp(FinClipApiType type,
- const char* app_id,
- const char* api_name,
- const char* params,
- Callback* callback);
-#endif
+DLL_EXPORT int FINSTDMETHODCALLTYPE finclip_invoke_api(
+ FinClipApiType type, const char* app_id, const char* api_name,
+ const char* params, FinclipApiCallback callback, void* input);
#ifdef __cplusplus
}
diff --git a/src/finclip_api_const.h b/src/finclip_api_const.h
index 4aa47d4..2cb5c75 100644
--- a/src/finclip_api_const.h
+++ b/src/finclip_api_const.h
@@ -1,6 +1,4 @@
-#ifndef SRC_FINCLIP_API_CONST_H_
-#define SRC_FINCLIP_API_CONST_H_
-#ifndef WRAPPER_SRC_PUBLIC_FINCLIP_API_CONST_H_
+#ifndef WRAPPER_SRC_PUBLIC_FINCLIP_API_CONST_H_
#define WRAPPER_SRC_PUBLIC_FINCLIP_API_CONST_H_
#define FIN_SID const char*
@@ -31,6 +29,22 @@ typedef struct objc_object* FINCLIP_WINDOW_HANDLE;
extern "C" {
#endif
+#define FINCLIP_CONFIG_APPSTORE "appstore"
+// appkey, secret, domain 从管理后台获取, 必填
+#define FINCLIP_CONFIG_APPKEY "appkey"
+#define FINCLIP_CONFIG_SECRET "secret"
+#define FINCLIP_CONFIG_DOMAIN "domain"
+//
+#define FINCLIP_CONFIG_WINDOW_STYLE "window_style"
+// 是否展示loading动画, 1: 展示, 0: 不展示
+#define FINCLIP_CONFIG_SHOW_LOADING "show_loading"
+// windows: finclip.exe位置, 默认为 ./finclip, 即当前目录下的finclip文件夹
+// macos: finclip.app的位置, 默认为
+#define FINCLIP_CONFIG_EXE_PATH "exe_path"
+// finclip.exe位置, 默认到当前目录的finclip文件夹下找
+#define FINCLIP_CONFIG_PAGE_PATH "page_path"
+// 启动参数, 值为序列化后的json
+#define FINCLIP_CONFIG_START_PARAMS "start_params"
/**
* @brief 启动机制设置
* kAsync: 异步启动
@@ -48,22 +62,19 @@ enum StartFlags {
*
*/
typedef enum { kApplet, kWebView } FinClipApiType;
-
/**
- * @brief 自定义api返回值回调
+ * @brief 调用h5方法后的返回值回调
*
*/
-typedef void (*FinclipApiCallback)(const char* res);
+typedef void (*FinclipApiCallback)(const char* res, void* input);
/**
* @brief 自定义api
*
*/
typedef void (*FinclipApiHandle)(const char* event, const char* param,
- FinclipApiCallback callback);
+ void* input, void* res);
#ifdef __cplusplus
}
#endif
#endif /* WRAPPER_SRC_PUBLIC_FINCLIP_API_CONST_H_ */
-
-#endif /* SRC_FINCLIP_API_CONST_H_ */
diff --git a/src/npm/finclip.cpp b/src/npm/finclip.cpp
index 1ed7ac4..7aadf28 100644
--- a/src/npm/finclip.cpp
+++ b/src/npm/finclip.cpp
@@ -1,10 +1,7 @@
-#include "../finclip_api.h"
-#include "resource.h"
-// Windows Header Files
+#include "../finclip_api.h"
+#include "./finclip.h"
#include
-// #include
#include
-// C RunTime Header Files
#include
#include
#include
@@ -17,97 +14,56 @@
#include
#include
-#include "json.hpp"
-
#pragma comment(lib, "FinClipSDKWrapper.lib")
-#define MAX_LOADSTRING 100
-#define IDM_SENDMESSAGE_1 32784
-#define IDM_SENDMESSAGE_2 32785
-#define IDC_FINCLIP 109
-
using namespace std;
-using json = nlohmann::json;
-
-std::string Utf8Encode(const std::wstring& wstr, int cp = CP_UTF8) {
- if (wstr.empty()) return std::string();
- int size_needed =
- WideCharToMultiByte(cp, 0, &wstr[0], static_cast(wstr.size()),
- nullptr, 0, nullptr, nullptr);
- std::string str(size_needed, 0);
- WideCharToMultiByte(cp, 0, &wstr[0], static_cast(wstr.size()), &str[0],
- size_needed, nullptr, nullptr);
- return str;
-}
-
-// Convert an UTF8 string to a wide Unicode String
-std::wstring Utf8Decode(const std::string& str, int cp = CP_UTF8) {
- if (str.empty()) return std::wstring();
- int size_needed = MultiByteToWideChar(
- cp, 0, &str[0], static_cast(str.size()), nullptr, 0);
- std::wstring wstr(size_needed, 0);
- MultiByteToWideChar(cp, 0, &str[0], static_cast(str.size()), &wstr[0],
- size_needed);
- return wstr;
-}
-
-void CustomApi(const char* event, const char* param,
- FinclipApiCallback callback) {
- std::string data = param;
- std::string e = event;
- std::string res = R"({"data":"ok"})";
- callback(res.c_str());
-}
namespace NodeFinClip {
using namespace Napi;
-// std::string current_appid;
std::string domain;
std::string appkey;
std::string appid;
std::string secret;
+char app_store[] = "1";
Napi::String start(const Napi::CallbackInfo& info) {
Napi::Env env = info.Env();
Napi::Object args = info[0].ToObject();
int handle = args.Get("handle").ToNumber().Int32Value();
- int appstore = 1;
- // string domain("https://finchat-mop-b.finogeeks.club");
- // string appkey("22LyZEib0gLTQdU3MUauAQVLIkNNhTSGIN42gXzlAsk=");
- // string appid("60e3c059949a5300014d0c07");
- // string secret("ae55433be2f62915");
- string type("1");
- std::string path = args.Get("finclipPath").ToString();
- auto* factory = finclip_get_packer_factory();
- auto* packer = finclip_packer_factory_get_config_packer(factory);
- auto* config = finclip_config_packer_new_config(packer);
- finclip_config_packer_add_config(packer, config);
- finclip_config_set_app_store(config, appstore);
- finclip_config_set_app_key(config, appkey.c_str());
- finclip_config_set_secret(config, secret.c_str());
- finclip_config_set_domain(config, domain.c_str());
- finclip_config_set_start_flag(config, kAppletSync);
- finclip_config_set_show_loading(config, false);
- finclip_config_set_exe_path(config, path.c_str());
- finclip_register_callback(packer, kApplet, "api", CustomApi);
- finclip_register_callback(packer, kWebView, "webapi", CustomApi);
- finclip_initialize(packer);
- finclip_start_applet(appstore, appid.c_str());
- // hWnd_container = GetForegroundWindow();
- // SetWindowPos(hWnd_container, HWND_TOP, 0, 0, 1024, 768,
- // SWP_ASYNCWINDOWPOS);
- // // hWnd_container = (HWND) handle;
- // // hWnd_container = GetFocus();
- // HRESULT hr = StartApplet(
- // hWnd_container, appstore, Utf8Encode(wappid).c_str(), "", packer,
- // args.Get("finclipPath").ToString().Utf8Value().c_str(),
- // FinclipAppletCallback);
- // current_appid = appid;
- finclip_set_position(appid.c_str(), 1000, 300, 540, 960);
- // SetAppletPos(Utf8Encode(wappid).c_str(), 0, 30, 540, 960, true);
- // packer->Release();
- return Napi::String::New(env, path);
+ std::string path = args.Get("finclipPath").ToString();
+
+ auto *factory = finclip_get_packer_factory();
+ auto *packer = finclip_packer_factory_get_config_packer(factory);
+ finclip_initialize(packer);
+ FinclipParams *config;
+ config = finclip_config_packer_get_config(packer, app_store);
+ if (config == nullptr) config = finclip_create_params();
+
+ finclip_params_set(config, FINCLIP_CONFIG_EXE_PATH, path.c_str());
+ finclip_params_set(config, FINCLIP_CONFIG_APPSTORE, "1");
+ finclip_params_set(config, FINCLIP_CONFIG_APPKEY, appkey.c_str());
+ finclip_params_set(config, FINCLIP_CONFIG_SECRET, secret.c_str());
+ finclip_params_set(config, FINCLIP_CONFIG_DOMAIN, domain.c_str());
+ // 可选参数
+ finclip_params_set(config, FINCLIP_CONFIG_SHOW_LOADING, "0");
+ finclip_config_packer_add_config(packer, config);
+
+ if (handle) {
+ finclip_start_applet_embed(app_store, appid.c_str(), (HWND)handle);
+ } else {
+ finclip_start_applet(app_store, appid.c_str());
+ }
+
+ return Napi::String::New(env, "success");
+}
+
+Napi::String embed(const Napi::CallbackInfo& info) {
+ Napi::Env env = info.Env();
+ Napi::Object args = info[0].ToObject();
+ int handle = args.Get("handle").ToNumber().Int32Value();
+ finclip_embed_applet(app_store, appid.c_str(), (HWND)handle);
+ return Napi::String::New(env, "success");
}
Napi::String close(const Napi::CallbackInfo& info) {
@@ -172,6 +128,8 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) {
Napi::Function::New(env, setAppletPos));
exports.Set(Napi::String::New(env, "createWindow"),
Napi::Function::New(env, createWindow));
+ exports.Set(Napi::String::New(env, "embed"),
+ Napi::Function::New(env, embed));
return exports;
}
diff --git a/src/npm/finclip.h b/src/npm/finclip.h
index d00d47e..b941dc8 100644
--- a/src/npm/finclip.h
+++ b/src/npm/finclip.h
@@ -1,3 +1,38 @@
-#pragma once
+#ifndef FINCLIP_H
+#define FINCLIP_H
-#include "resource.h"
+#include "../finclip_api.h"
+
+typedef IPackerFactory *(FINSTDMETHODCALLTYPE *findll_get_packer_factory)();
+typedef IFinConfigPacker *(
+ FINSTDMETHODCALLTYPE *findll_packer_factory_get_config_packer)(
+ IPackerFactory *factory);
+typedef int(FINSTDMETHODCALLTYPE *findll_config_packer_add_config)(
+ IFinConfigPacker *packer, FinclipParams *config);
+
+typedef void(FINSTDMETHODCALLTYPE *findll_register_api)(
+ IFinConfigPacker *packer, FinClipApiType type, const char *apis,
+ FinclipApiHandle handle, void *input);
+typedef int(FINSTDMETHODCALLTYPE *findll_initialize)(
+ IFinConfigPacker *configpacker);
+typedef int(FINSTDMETHODCALLTYPE *findll_start_applet)(char *appstore,
+ const char *appid);
+typedef int(FINSTDMETHODCALLTYPE *findll_invoke_api)(
+ FinClipApiType type, const char *app_id, const char *api_name,
+ const char *params, FinclipApiCallback callback, void *input);
+
+typedef int(FINSTDMETHODCALLTYPE *findll_embed_applet)(const char *appstore,
+ const char *appid,
+ HWND container);
+
+typedef int(FINSTDMETHODCALLTYPE *findll_params_set)(FinclipParams *params,
+ const char *key,
+ const char *value);
+typedef int(FINSTDMETHODCALLTYPE *findll_params_del)(FinclipParams *params,
+ const char *key);
+typedef FinclipParams *(FINSTDMETHODCALLTYPE *findll_create_params)();
+typedef void(FINSTDMETHODCALLTYPE *findll_destory_params)(
+ FinclipParams *params);
+typedef int(FINSTDMETHODCALLTYPE *findll_close_all_applet)();
+
+#endif // MAINWINDOW_H
\ No newline at end of file
diff --git a/src/npm/index.js b/src/npm/index.js
index ba64dc0..9188400 100644
--- a/src/npm/index.js
+++ b/src/npm/index.js
@@ -1,32 +1,14 @@
-
-// setTimeout(() => {
-const hw = require('./build/Release/_finclip.node');
-hw.createWindow({});
-console.log('gg')
-// console.log(hw.start({
-// handle: 41419442,
-// finclipPath: `C:\\Users\\gyt\\Code\\FinChat\\local-module\\fincliplib\\finclip.exe`
-// }))
-// }, 1000 * 6);
-
-
-// const { Worker } = require('worker_threads');
-
-// const worker = new Worker(`
-// const hw = require('./build/Release/_finclip.node');
-// setTimeout(() => {
-// console.log(hw.start({
-// handle: 41419442,
-// finclipPath: 'C:\\\\Users\\\\gyt\\\\Code\\\\FinChat\\\\local-module\\\\fincliplib\\\\finclip.exe'
-// }))
-// }, 1000 * 6);
-// setTimeout(() => {
-
-// }, 1000 * 60 * 60);
-// `, { eval: true });
-// worker.on('message', message => console.log(message));
-// worker.postMessage('ping');
-
+const path = require('path');
+const finclip = require('./build/Release/_finclip.node');
+finclip.setDomain('https://finclip-testing.finogeeks.club');
+finclip.setAppkey('22LyZEib0gLTQdU3MUauAfJ/xujwNfM6OvvEqQyH4igA');
+finclip.setAppid('6152b5dbfcfb4e0001448e6e');
+finclip.setSecret('703b9026be3d6bc5');
+const finclipPath = path.resolve(__dirname, '../../vendor/win/x64/finclip.exe');
+console.log('finclipPath', finclipPath);
+const result = finclip.start({
+ handle: 0,
+ finclipPath,
+});
setTimeout(() => {
-
}, 1000 * 60 * 60);
\ No newline at end of file
diff --git a/src/npm/json.hpp b/src/npm/json.hpp
deleted file mode 100644
index 87475ab..0000000
--- a/src/npm/json.hpp
+++ /dev/null
@@ -1,26753 +0,0 @@
-/*
- __ _____ _____ _____
- __| | __| | | | JSON for Modern C++
-| | |__ | | | | | | version 3.10.4
-|_____|_____|_____|_|___| https://github.com/nlohmann/json
-
-Licensed under the MIT License .
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann .
-
-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.
-*/
-
-#ifndef INCLUDE_NLOHMANN_JSON_HPP_
-#define INCLUDE_NLOHMANN_JSON_HPP_
-
-#define NLOHMANN_JSON_VERSION_MAJOR 3
-#define NLOHMANN_JSON_VERSION_MINOR 10
-#define NLOHMANN_JSON_VERSION_PATCH 4
-
-#include // all_of, find, for_each
-#include // nullptr_t, ptrdiff_t, size_t
-#include // hash, less
-#include // initializer_list
-#ifndef JSON_NO_IO
- #include // istream, ostream
-#endif // JSON_NO_IO
-#include // random_access_iterator_tag
-#include // unique_ptr
-#include // accumulate
-#include // string, stoi, to_string
-#include // declval, forward, move, pair, swap
-#include // vector
-
-// #include
-
-
-#include
-#include
-
-// #include
-
-
-#include // transform
-#include // array
-#include // forward_list
-#include // inserter, front_inserter, end
-#include