plugin-data-source-mssql 2.0.7 → 2.0.10

package/dist/tedious/node_modules/undici-types/dispatcher.d.ts

@@ -96,7 +96,7 @@ declare class Dispatcher extends EventEmitter {
 }
 
 declare namespace Dispatcher {
-  export interface ComposedDispatcher extends Dispatcher {}
+  export interface ComposedDispatcher extends Dispatcher { }
   export type Dispatch = Dispatcher['dispatch']
   export type DispatcherComposeInterceptor = (dispatch: Dispatch) => Dispatch
   export interface DispatchOptions {
@@ -113,6 +113,8 @@ declare namespace Dispatcher {
     idempotent?: boolean;
     /** Whether the response is expected to take a long time and would end up blocking the pipeline. When this is set to `true` further pipelining will be avoided on the same connection until headers have been received. Defaults to `method !== 'HEAD'`. */
     blocking?: boolean;
+    /** The IP Type of Service (ToS) value for the request socket. Must be an integer between 0 and 255. Default: `0` */
+    typeOfService?: number | null;
     /** Upgrade the request. Should be used to specify the kind of upgrade i.e. `'Websocket'`. Default: `method === 'CONNECT' || null`. */
     upgrade?: boolean | string | null;
     /** The amount of time, in milliseconds, the parser will wait to receive the complete HTTP headers. Defaults to 300 seconds. */
@@ -181,6 +183,7 @@ declare namespace Dispatcher {
   }
   export interface ResponseData<TOpaque = null> {
     statusCode: number;
+    statusText: string;
     headers: IncomingHttpHeaders;
     body: BodyReadable & BodyMixin;
     trailers: Record<string, string>;
@@ -212,10 +215,10 @@ declare namespace Dispatcher {
   export type StreamFactory<TOpaque = null> = (data: StreamFactoryData<TOpaque>) => Writable
 
   export interface DispatchController {
-    get aborted () : boolean
-    get paused () : boolean
-    get reason () : Error | null
-    abort (reason: Error): void
+    get aborted(): boolean
+    get paused(): boolean
+    get reason(): Error | null
+    abort(reason: Error): void
     pause(): void
     resume(): void
   }

package/dist/tedious/node_modules/undici-types/errors.d.ts

@@ -154,8 +154,24 @@ declare namespace Errors {
     code: 'UND_ERR_PRX_TLS'
   }
 
-  class MaxOriginsReachedError extends UndiciError {
+  export class MaxOriginsReachedError extends UndiciError {
     name: 'MaxOriginsReachedError'
     code: 'UND_ERR_MAX_ORIGINS_REACHED'
   }
+
+  /** SOCKS5 proxy related error. */
+  export class Socks5ProxyError extends UndiciError {
+    constructor (
+      message?: string,
+      code?: string
+    )
+    name: 'Socks5ProxyError'
+    code: string
+  }
+
+  /** WebSocket decompressed message exceeded maximum size. */
+  export class MessageSizeExceededError extends UndiciError {
+    name: 'MessageSizeExceededError'
+    code: 'UND_ERR_WS_MESSAGE_SIZE_EXCEEDED'
+  }
 }

package/dist/tedious/node_modules/undici-types/index.d.ts

@@ -18,6 +18,7 @@ import { SnapshotAgent } from './snapshot-agent'
 import { MockCallHistory, MockCallHistoryLog } from './mock-call-history'
 import mockErrors from './mock-errors'
 import ProxyAgent from './proxy-agent'
+import Socks5ProxyAgent from './socks5-proxy-agent'
 import EnvHttpProxyAgent from './env-http-proxy-agent'
 import RetryHandler from './retry-handler'
 import RetryAgent from './retry-agent'
@@ -43,7 +44,7 @@ export { Interceptable } from './mock-interceptor'
 
 declare function globalThisInstall (): void
 
-export { Dispatcher, BalancedPool, RoundRobinPool, Pool, Client, buildConnector, errors, Agent, request, stream, pipeline, connect, upgrade, setGlobalDispatcher, getGlobalDispatcher, setGlobalOrigin, getGlobalOrigin, interceptors, cacheStores, MockClient, MockPool, MockAgent, SnapshotAgent, MockCallHistory, MockCallHistoryLog, mockErrors, ProxyAgent, EnvHttpProxyAgent, RedirectHandler, DecoratorHandler, RetryHandler, RetryAgent, H2CClient, globalThisInstall as install }
+export { Dispatcher, BalancedPool, RoundRobinPool, Pool, Client, buildConnector, errors, Agent, request, stream, pipeline, connect, upgrade, setGlobalDispatcher, getGlobalDispatcher, setGlobalOrigin, getGlobalOrigin, interceptors, cacheStores, MockClient, MockPool, MockAgent, SnapshotAgent, MockCallHistory, MockCallHistoryLog, mockErrors, ProxyAgent, Socks5ProxyAgent, EnvHttpProxyAgent, RedirectHandler, DecoratorHandler, RetryHandler, RetryAgent, H2CClient, globalThisInstall as install }
 export default Undici
 
 declare namespace Undici {
@@ -73,6 +74,8 @@ declare namespace Undici {
   const MockCallHistory: typeof import('./mock-call-history').MockCallHistory
   const MockCallHistoryLog: typeof import('./mock-call-history').MockCallHistoryLog
   const mockErrors: typeof import('./mock-errors').default
+  const ProxyAgent: typeof import('./proxy-agent').default
+  const Socks5ProxyAgent: typeof import('./socks5-proxy-agent').default
   const fetch: typeof import('./fetch').fetch
   const Headers: typeof import('./fetch').Headers
   const Response: typeof import('./fetch').Response

package/dist/tedious/node_modules/undici-types/interceptors.d.ts

@@ -60,6 +60,13 @@ declare namespace Interceptors {
      * @default []
      */
     excludeHeaderNames?: string[]
+    /**
+     * Maximum bytes buffered per paused waiting deduplicated handler.
+     * If a waiting handler remains paused and exceeds this threshold,
+     * it is failed with an abort error to prevent unbounded memory growth.
+     * @default 5 * 1024 * 1024
+     */
+    maxBufferSize?: number
   }
 
   export function dump (opts?: DumpInterceptorOpts): Dispatcher.DispatcherComposeInterceptor

package/dist/tedious/node_modules/undici-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "undici-types",
-  "version": "7.19.2",
+  "version": "7.24.6",
   "description": "A stand-alone types package for Undici",
   "homepage": "https://undici.nodejs.org",
   "bugs": {

package/dist/tedious/node_modules/undici-types/socks5-proxy-agent.d.ts

@@ -0,0 +1,25 @@
+import Dispatcher from './dispatcher'
+import buildConnector from './connector'
+import { IncomingHttpHeaders } from './header'
+import Pool from './pool'
+
+export default Socks5ProxyAgent
+
+declare class Socks5ProxyAgent extends Dispatcher {
+  constructor (proxyUrl: string | URL, options?: Socks5ProxyAgent.Options)
+}
+
+declare namespace Socks5ProxyAgent {
+  export interface Options extends Pool.Options {
+    /** Additional headers to send with the proxy connection */
+    headers?: IncomingHttpHeaders;
+    /** SOCKS5 proxy username for authentication */
+    username?: string;
+    /** SOCKS5 proxy password for authentication */
+    password?: string;
+    /** Custom connector function for proxy connection */
+    connect?: buildConnector.connector;
+    /** TLS options for the proxy connection (for SOCKS5 over TLS) */
+    proxyTls?: buildConnector.BuildOptions;
+  }
+}

package/dist/tedious/node_modules/undici-types/webidl.d.ts

@@ -1,4 +1,5 @@
 // These types are not exported, and are only used internally
+import { BufferSource } from 'node:stream/web'
 import * as undici from './index'
 
 /**
@@ -93,6 +94,11 @@ interface WebidlUtil {
   IsResizableArrayBuffer (V: ArrayBufferLike): boolean
 
   HasFlag (flag: number, attributes: number): boolean
+
+  /**
+   * @see https://webidl.spec.whatwg.org/#dfn-get-buffer-source-copy
+   */
+  getCopyOfBytesHeldByBufferSource (bufferSource: BufferSource): Uint8Array
 }
 
 interface WebidlConverters {

package/dist/tedious/node_modules/undici-types/websocket.d.ts

@@ -169,6 +169,8 @@ interface WebSocketStream {
     writable: WritableStream
   }>
   url: string
+
+  close(options?: Partial<WebSocketCloseInfo>): void
 }
 
 export declare const WebSocketStream: {

package/package.json

@@ -3,10 +3,10 @@
   "displayName": "Data source: MSSQL",
   "displayName.ru-RU": "Источник данных: MSSQL",
   "displayName.zh-CN": "数据源：MSSQL",
-  "version": "2.0.7",
+  "version": "2.0.10",
   "description": "External MSSQL data source support for NocoBase.",
   "license": "MIT",
-  "main": "./dist/server/index.js",
+  "main": "dist/server/index.js",
   "scripts": {
     "postbuild": "node ./scripts/copy-tedious.js",
     "prepack": "node ./scripts/copy-tedious.js"
@@ -15,8 +15,21 @@
     "Data sources"
   ],
   "files": [
-    "dist"
+    "dist",
+    "client.js",
+    "client.d.ts",
+    "server.js",
+    "server.d.ts",
+    "client-v2.js",
+    "client-v2.d.ts",
+    "src"
   ],
+  "nocobase": {
+    "supportedVersions": [
+      "2.x"
+    ],
+    "editionLevel": 0
+  },
   "devDependencies": {
     "tedious": "^18.6.1"
   },
@@ -26,6 +39,8 @@
     "@nocobase/database": "2.x",
     "@nocobase/plugin-data-source-manager": "2.x",
     "@nocobase/server": "2.x",
-    "@nocobase/test": "2.x"
+    "@nocobase/test": "2.x",
+    "@nocobase/client-v2": "2.x",
+    "@nocobase/flow-engine": "2.x"
   }
 }

package/server.d.ts

@@ -0,0 +1 @@
+export * from './dist/server';

package/server.js

@@ -0,0 +1 @@
+module.exports = require('./dist/server');

package/src/client/components/MssqlConfigForm.tsx

@@ -0,0 +1,92 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import React, { useCallback, useState } from 'react';
+import { Checkbox, Form, Input, InputNumber, Select } from 'antd';
+import { useTranslation } from 'react-i18next';
+
+interface MssqlConfigFormProps {
+  mode: 'create' | 'edit';
+  type: Record<string, any>;
+  initialValues?: Record<string, any>;
+  loadCollections: (key: string) => Promise<any>;
+}
+
+function toCollectionOptions(result: any): { label: string; value: string }[] {
+  const list = result?.data?.data ?? result?.data ?? result ?? [];
+  if (!Array.isArray(list)) return [];
+  return list.map((item: any) => {
+    const name = typeof item === 'string' ? item : item?.name;
+    return { label: name, value: name };
+  });
+}
+
+export const MssqlConfigForm: React.FC<MssqlConfigFormProps> = ({ initialValues, loadCollections }) => {
+  const { t } = useTranslation();
+  const form = Form.useFormInstance();
+  const addAllCollections = Form.useWatch('addAllCollections', form);
+  const [collectionOptions, setCollectionOptions] = useState<{ label: string; value: string }[]>([]);
+  const [loading, setLoading] = useState(false);
+
+  const handleLoadCollections = useCallback(async () => {
+    setLoading(true);
+    try {
+      const result = await loadCollections(initialValues?.key);
+      setCollectionOptions(toCollectionOptions(result));
+    } finally {
+      setLoading(false);
+    }
+  }, [loadCollections, initialValues?.key]);
+
+  return (
+    <>
+      <Form.Item name={['options', 'host']} label={t('Host')} rules={[{ required: true }]}>
+        <Input placeholder="localhost" />
+      </Form.Item>
+      <Form.Item name={['options', 'port']} label={t('Port')} rules={[{ required: true }]} initialValue={1433}>
+        <InputNumber min={1} max={65535} style={{ width: '100%' }} />
+      </Form.Item>
+      <Form.Item name={['options', 'database']} label={t('Database')} rules={[{ required: true }]}>
+        <Input />
+      </Form.Item>
+      <Form.Item name={['options', 'schema']} label={t('Schema')}>
+        <Input />
+      </Form.Item>
+      <Form.Item name={['options', 'username']} label={t('Username')} rules={[{ required: true }]}>
+        <Input />
+      </Form.Item>
+      <Form.Item name={['options', 'password']} label={t('Password')}>
+        <Input.Password />
+      </Form.Item>
+      <Form.Item name={['options', 'encrypt']} label={t('Encrypt')} valuePropName="checked">
+        <Checkbox />
+      </Form.Item>
+      <Form.Item name={['options', 'tablePrefix']} label={t('Table prefix')}>
+        <Input />
+      </Form.Item>
+      <Form.Item name="addAllCollections" label={t('Load all collections')} valuePropName="checked" initialValue={true}>
+        <Checkbox />
+      </Form.Item>
+      {!addAllCollections ? (
+        <Form.Item name="collections" label={t('Collections')}>
+          <Select
+            mode="multiple"
+            allowClear
+            loading={loading}
+            options={collectionOptions}
+            onFocus={handleLoadCollections}
+            optionFilterProp="label"
+          />
+        </Form.Item>
+      ) : null}
+    </>
+  );
+};
+
+export default MssqlConfigForm;

package/src/client/components/MssqlDeleteCollection.tsx

@@ -0,0 +1,194 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/**
+ * Custom DeleteCollection component for MSSQL data source plugin.
+ * This component handles the delete action properly for external data sources
+ * by using the correct API endpoint with the data source key.
+ */
+
+import { DeleteOutlined, ExclamationCircleFilled } from '@ant-design/icons';
+import { css } from '@emotion/css';
+import { useForm } from '@formily/react';
+import { Button, Modal, message } from 'antd';
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useParams } from 'react-router-dom';
+import {
+  ActionContextProvider,
+  RecordProvider,
+  SchemaComponent,
+  useAPIClient,
+  useRecord,
+  useResourceActionContext,
+} from '@nocobase/client';
+import { useCancelAction, useCollectionManager_deprecated } from '@nocobase/client';
+
+export const MssqlDeleteCollection = (props: any) => {
+  const record = useRecord();
+  return <MssqlDeleteCollectionAction item={record} {...props} />;
+};
+
+const useDestroyActionForExternalDS = () => {
+  const { refresh } = useResourceActionContext();
+  const { name: dataSourceKey } = useParams<{ name: string }>();
+  const record = useRecord();
+  const api = useAPIClient();
+  const form = useForm();
+  const { cascade } = form?.values || {};
+  const collectionName = record?.name;
+
+  return {
+    async run() {
+      if (!collectionName) {
+        message.error('Collection name is missing');
+        return;
+      }
+
+      try {
+        await api.request({
+          url: `dataSources/${dataSourceKey}/collections:destroy`,
+          method: 'post',
+          params: {
+            filterByTk: collectionName,
+            cascade,
+          },
+        });
+        message.success('Collection deleted successfully');
+        refresh();
+      } catch (error: any) {
+        message.error(error?.response?.data?.errors?.[0]?.message || 'Failed to delete collection');
+        throw error;
+      }
+    },
+  };
+};
+
+const useDestroyActionAndRefreshCMForExternalDS = () => {
+  const { run } = useDestroyActionForExternalDS();
+  const { refreshCM } = useCollectionManager_deprecated();
+  return {
+    async run() {
+      await run();
+      await refreshCM();
+    },
+  };
+};
+
+export const MssqlDeleteCollectionAction = (props: any) => {
+  const { scope, getContainer, item: record, children, isBulk, useAction, ...otherProps } = props;
+  const { t } = useTranslation();
+  const [visible, setVisible] = useState(false);
+
+  const getDestroyCollectionAction = () => {
+    if (useAction) {
+      return useAction;
+    }
+    return useDestroyActionAndRefreshCMForExternalDS;
+  };
+
+  const Title = () => {
+    return (
+      <span>
+        <ExclamationCircleFilled style={{ color: '#faad14', marginRight: '12px', fontSize: '22px' }} />
+        <span style={{ fontSize: '19px' }}>{t('Delete collection')}</span>
+      </span>
+    );
+  };
+
+  return (
+    <RecordProvider record={record}>
+      <ActionContextProvider value={{ visible, setVisible }}>
+        {isBulk ? (
+          <Button icon={<DeleteOutlined />} onClick={() => setVisible(true)}>
+            {children || t('Delete')}
+          </Button>
+        ) : (
+          <a onClick={() => setVisible(true)} {...otherProps}>
+            {children || t('Delete')}
+          </a>
+        )}
+        <SchemaComponent
+          schema={{
+            type: 'object',
+            properties: {
+              deleteCollection: {
+                type: 'void',
+                'x-decorator': 'Form',
+                'x-component': 'Action.Modal',
+                title: <Title />,
+                'x-component-props': {
+                  width: 520,
+                  getContainer: '{{ getContainer }}',
+                  className: css`
+                    .ant-modal-body {
+                      margin-left: 35px;
+                      margin-bottom: 35px;
+                      .ant-checkbox-wrapper {
+                        height: 25px;
+                      }
+                    }
+                  `,
+                },
+                properties: {
+                  info: {
+                    type: 'string',
+                    'x-component': 'div',
+                    'x-content': "{{t('Are you sure you want to delete it?')}}",
+                  },
+                  cascade: {
+                    type: 'boolean',
+                    'x-decorator': 'FormItem',
+                    'x-component': 'Checkbox',
+                    default: false,
+                    'x-content': t(
+                      'Automatically drop objects that depend on the collection (such as views), and in turn all objects that depend on those objects',
+                    ),
+                  },
+                  footer: {
+                    type: 'void',
+                    'x-component': 'Action.Modal.Footer',
+                    properties: {
+                      action1: {
+                        title: '{{ t("Cancel") }}',
+                        'x-component': 'Action',
+                        'x-component-props': {
+                          useAction: '{{ useCancelAction }}',
+                        },
+                      },
+                      action2: {
+                        title: '{{ t("Ok") }}',
+                        'x-component': 'Action',
+                        'x-component-props': {
+                          type: 'primary',
+                          useAction: '{{ useDestroyCollectionAction }}',
+                          style: {
+                            marginLeft: '8px',
+                          },
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          }}
+          scope={{
+            getContainer,
+            useDestroyCollectionAction: getDestroyCollectionAction(),
+            useCancelAction,
+            ...scope,
+          }}
+        />
+      </ActionContextProvider>
+    </RecordProvider>
+  );
+};
+
+MssqlDeleteCollectionAction.displayName = 'MssqlDeleteCollectionAction';

package/src/client/index.tsx

@@ -0,0 +1,34 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Plugin } from '@nocobase/client';
+import PluginDataSourceManagerClient from '@nocobase/plugin-data-source-manager/client';
+import { MssqlConfigForm } from './components/MssqlConfigForm';
+import { MssqlDeleteCollection } from './components/MssqlDeleteCollection';
+
+export class PluginDataSourceMssqlClient extends Plugin {
+  async load() {
+    console.log('[MSSQL Plugin] Client loading...');
+    const manager = this.app.pm.get(PluginDataSourceManagerClient);
+
+    manager.registerType('mssql', {
+      name: 'mssql',
+      label: 'External MSSQL',
+      icon: 'DatabaseOutlined',
+      color: 'blue',
+      DataSourceSettingsForm: MssqlConfigForm,
+      DeleteCollection: MssqlDeleteCollection,
+      disableTestConnection: false,
+      disableAddFields: false,
+      allowCollectionDeletion: true,
+    });
+  }
+}
+
+export default PluginDataSourceMssqlClient;

package/src/client-v2/index.tsx

@@ -0,0 +1 @@
+export { default } from './plugin';

package/src/client-v2/plugin.tsx

@@ -0,0 +1,19 @@
+import { Plugin, Application } from '@nocobase/client-v2';
+import PluginDataSourceManagerClientV2 from '@nocobase/plugin-data-source-manager/client-v2';
+import React from 'react';
+
+export class PluginDataSourceMssqlClient extends Plugin<Record<string, never>, Application> {
+  async load() {
+    const manager = this.app.pm.get(PluginDataSourceManagerClientV2);
+    if (manager) {
+      manager.registerType('mssql', {
+        label: 'External MSSQL',
+        SettingsForm: React.lazy(() => import('../client/components/MssqlConfigForm').then(m => ({ default: m.MssqlConfigForm }))),
+        disableTestConnection: false,
+        disableAddFields: false,
+      });
+    }
+  }
+}
+
+export default PluginDataSourceMssqlClient;

package/src/index.ts

@@ -0,0 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export * from './server';
+export { default } from './server';