@scrypted/server 0.81.0 → 0.83.0

package/src/services/plugin.ts

@@ -1,11 +1,22 @@
 import { ScryptedInterfaceProperty, ScryptedNativeId } from "@scrypted/types";
 import semver from 'semver';
 import { Plugin } from '../db-types';
-import { getNpmPackageInfo } from "../http-fetch-helpers";
 import { hasMixinCycle } from "../mixin/mixin-cycle";
 import { ScryptedRuntime } from "../runtime";
 import { sleep } from "../sleep";
 import { getState } from "../state";
+import { httpFetch } from "../fetch/http-fetch";
+
+
+export async function getNpmPackageInfo(pkg: string) {
+    const { body } = await httpFetch({
+        url: `https://registry.npmjs.org/${pkg}`,
+        // force ipv4 in case of busted ipv6.
+        family: 4,
+        responseType: 'json',
+    });
+    return body;
+}
 
 export class PluginComponent {
     scrypted: ScryptedRuntime;

package/src/services/service-control.ts

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import { httpFetch } from "../http-fetch-helpers";
+import { httpFetch } from "../fetch/http-fetch";
 import { ScryptedRuntime } from "../runtime";
 
 export class ServiceControl {

package/dist/http-fetch-helpers.d.ts

@@ -1,42 +0,0 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-import { IncomingMessage } from 'http';
-import type { Readable } from 'stream';
-export type HttpFetchResponseType = 'json' | 'text' | 'buffer' | 'readable';
-export interface HttpFetchOptions<T extends HttpFetchResponseType> {
-    url: string | URL;
-    family?: 4 | 6;
-    method?: string;
-    headers?: HeadersInit;
-    timeout?: number;
-    rejectUnauthorized?: boolean;
-    ignoreStatusCode?: boolean;
-    body?: Readable;
-    responseType?: T;
-}
-export interface HttpFetchJsonOptions extends HttpFetchOptions<'json'> {
-}
-export interface HttpFetchBufferOptions extends HttpFetchOptions<'buffer'> {
-}
-export interface HttpFetchTextOptions extends HttpFetchOptions<'text'> {
-}
-export interface HttpFetchReadableOptions extends HttpFetchOptions<'readable'> {
-}
-export interface FetchParser<T> {
-    accept: string;
-    parse(message: IncomingMessage): Promise<T>;
-}
-export declare function getNpmPackageInfo(pkg: string): Promise<any>;
-export declare function getHttpFetchAccept(responseType: HttpFetchResponseType): string;
-export declare function setDefaultHttpFetchAccept(headers: Headers, responseType: HttpFetchResponseType): void;
-export declare function fetchStatusCodeOk(statusCode: number): boolean;
-export declare function checkStatus(statusCode: number): void;
-export interface HttpFetchResponse<T> {
-    statusCode: number;
-    headers: Headers;
-    body: T;
-}
-export declare function getHttpFetchParser(responseType: HttpFetchResponseType): FetchParser<any>;
-export declare function parseResponseType(readable: IncomingMessage, responseType: HttpFetchResponseType): Promise<any>;
-export declare function httpFetch<T extends HttpFetchOptions<HttpFetchResponseType>>(options: T): Promise<HttpFetchResponse<T extends HttpFetchBufferOptions ? Buffer : T extends HttpFetchTextOptions ? string : T extends HttpFetchReadableOptions ? IncomingMessage : T extends HttpFetchJsonOptions ? any : Buffer>>;

package/dist/http-fetch-helpers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"http-fetch-helpers.js","sourceRoot":"","sources":["../src/http-fetch-helpers.ts"],"names":[],"mappings":"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"}